[Bf-blender-cvs] [abed546] asset-experiments: Fix crash due to some missing final jop update in some rare cases.

Bastien Montagne noreply at git.blender.org
Sat May 9 16:43:08 CEST 2015


Commit: abed5466727141b8e73b76068c9090e900440267
Author: Bastien Montagne
Date:   Sat May 9 16:00:07 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBabed5466727141b8e73b76068c9090e900440267

Fix crash due to some missing final jop update in some rare cases.

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

M	source/blender/editors/space_file/filelist.c

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

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 8a3f4f6..3c9e5d6 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -2414,6 +2414,8 @@ static void filelist_readjob_do(
 		if (nbr_entries) {
 			BLI_mutex_lock(lock);
 
+			*do_update = true;
+
 			BLI_movelisttolist(&filelist->filelist.entries, &entries);
 			filelist->filelist.nbr_entries += nbr_entries;
 
@@ -2422,7 +2424,6 @@ static void filelist_readjob_do(
 
 		nbr_done_dirs++;
 		*progress = (float)nbr_done_dirs / (float)nbr_todo_dirs;
-		*do_update = true;
 		MEM_freeN(subdir);
 	}
 
@@ -2527,6 +2528,9 @@ static void filelist_readjob_endjob(void *flrjv)
 {
 	FileListReadJob *flrj = flrjv;
 
+	/* In case there would be some dangling update... */
+	filelist_readjob_update(flrjv);
+
 	flrj->filelist->filelist_pending = false;
 	flrj->filelist->filelist_ready = true;
 }




More information about the Bf-blender-cvs mailing list