[Bf-blender-cvs] [9e48f01] master: Proxy job: make user cancelling actually matter

Antony Riakiotakis noreply at git.blender.org
Tue Jan 27 12:30:15 CET 2015


Commit: 9e48f010c41de37cd835fdfe9597c732fc29768d
Author: Antony Riakiotakis
Date:   Tue Jan 27 12:29:45 2015 +0100
Branches: master
https://developer.blender.org/rB9e48f010c41de37cd835fdfe9597c732fc29768d

Proxy job: make user cancelling actually matter

===================================================================

M	source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 5f9900d..42c81a3 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -146,11 +146,12 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
 		struct SeqIndexBuildContext *context = link->data;
 
 		BKE_sequencer_proxy_rebuild(context, stop, do_update, progress);
-	}
-
-	if (*stop) {
-		pj->stop = 1;
-		fprintf(stderr,  "Canceling proxy rebuild on users request...\n");
+		
+		if (*stop) {
+			pj->stop = 1;
+			fprintf(stderr,  "Canceling proxy rebuild on users request...\n");
+			break;
+		}
 	}
 }




More information about the Bf-blender-cvs mailing list