Fix race condition upon reloading animations

phillipberndt · Jan 30, 2017 · e6c004a · e6c004a
1 parent a31b979
commit e6c004a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.markdown b/README.markdown
@@ -132,9 +132,10 @@ Known bugs
 Changelog
 ---------
 
-pqiv 2.7.2
+pqiv 2.7.3
  * Fix GTK 2 compilation
  * Fix backends list in configure script
+ * Fix race condition upon reloading animations
 
 pqiv 2.7
  * Fixed window decoration toggling with --transparent-background

diff --git a/pqiv.c b/pqiv.c
@@ -1494,7 +1494,7 @@ void invalidate_current_scaled_image_surface() {/*{{{*/
 }/*}}}*/
 gboolean image_animation_timeout_callback(gpointer user_data) {/*{{{*/
 	D_LOCK(file_tree);
-	if((BOSNode *)user_data != current_file_node || FILE(current_file_node)->force_reload) {
+	if((BOSNode *)user_data != current_file_node || FILE(current_file_node)->force_reload || !FILE(current_file_node)->is_loaded) {
 		D_UNLOCK(file_tree);
 		current_image_animation_timeout_id = 0;
 		return FALSE;

diff --git a/pqiv.h b/pqiv.h
@@ -29,7 +29,7 @@
 #include "lib/bostree.h"
 
 #ifndef PQIV_VERSION
-#define PQIV_VERSION "2.7.2"
+#define PQIV_VERSION "2.7.3"
 #endif
 
 #define FILE_FLAGS_ANIMATION      (guint)(1)