From 51698ca6ac57361ca3a5d9aa7d3b3a67374f8b49 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Wed, 11 Aug 2021 09:28:59 -0500
Subject: [PATCH] debug_movie fixes

---
 Attorney_Online.pro | 2 ++
 src/aolayer.cpp     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index 2a5c1e1..2498232 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -19,6 +19,8 @@ QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
 # Uncomment for verbose network logging
 # DEFINES += DEBUG_NETWORK
 
+DEFINES += DEBUG_MOVIE
+
 # Uncomment for building with debug symbols
 # CONFIG += debug
 
diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 7ec42b9..075338b 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -344,7 +344,7 @@ void AOLayer::start_playback(QString p_image)
   if (duration > 0 && cull_image == true)
     shfx_timer->start(duration);
 #ifdef DEBUG_MOVIE
-  qDebug() << max_frames << "Setting image to " << image_path
+  qDebug() << max_frames << "Setting image to " << p_image
            << "Time taken to process image:" << actual_time.elapsed();
 
   actual_time.restart();
@@ -548,11 +548,11 @@ void AOLayer::movie_ticker()
     else
       frame = 0;
   }
+  future.waitForFinished(); // don't set the frame before we definitely have it in memory
 #ifdef DEBUG_MOVIE
   qDebug() << frame << movie_delays[frame]
            << "actual time taken from last frame:" << actual_time.restart();
 #endif
-  future.waitForFinished(); // don't set the frame before we definitely have it in memory
   this->set_frame(movie_frames[frame]);
   ticker->setInterval(this->get_frame_delay(movie_delays[frame]));
   if (frame + 1 >= movie_frames.size() && frame + 1 < max_frames) { // load the next frame before we tick again