From ee90d89ef46fa63a598a03f11bc7fd7675ab7951 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 May 2021 12:53:42 +1000
Subject: [PATCH] viewer: move set code lower and return

---
 app/widget/viewer/viewer.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 245c2efe6..ae1b8b969 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -484,12 +484,6 @@ void ViewerWidget::UpdateTextureFromNode()
 
         } else {
 
-          if (playback_queue_.size() == 1) {
-            // This is the last frame left in the queue. Even though it's incorrect, we'll show it
-            // just for improved user feedback
-            SetDisplayImage(pf.frame, true);
-          }
-
           // Skip this frame
           PopOldestFrameFromPlaybackQueue();
           if (popped) {
@@ -501,6 +495,13 @@ void ViewerWidget::UpdateTextureFromNode()
             popped = true;
           }
 
+          if (playback_queue_.empty()) {
+            // This was the last frame left in the queue. Even though it's old, we'll show it
+            // just for improved user feedback
+            SetDisplayImage(pf.frame, true);
+            return;
+          }
+
         }
       }
     }