From b237bf3df004656f0668fbcf5c507b95a6e94504 Mon Sep 17 00:00:00 2001
From: Cyril Hrubis <metan@ucw.cz>
Date: Sun, 10 Jun 2012 22:51:30 +0200
Subject: [PATCH] spiv: Fix progress callback.

---
 demos/spiv/spiv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c
index 531dfc8d..c0e918de 100644
--- a/demos/spiv/spiv.c
+++ b/demos/spiv/spiv.c
@@ -140,9 +140,6 @@ GP_Context *load_image(struct loader_params *params, int elevate)
 
 	/* Image not cached, load it */
 	if (img == NULL) {
-		show_progress = params->show_progress || params->show_progress_once;
-		params->show_progress_once = 0;
-
 		fprintf(stderr, "Loading '%s'\n", params->img_path);
 
 		cpu_timer_start(&timer, "Loading");
@@ -244,6 +241,9 @@ static void *image_loader(void *ptr)
 	GP_ProgressCallback callback = {.callback = image_loader_callback};
 
 	cpu_timer_start(&sum_timer, "sum");
+	
+	show_progress = params->show_progress || params->show_progress_once;
+	params->show_progress_once = 0;
 
 	/* Figure out rotation */
 	GP_Size w, h;
-- 
2.11.4.GIT