[Bf-blender-cvs] [e106a21] master: Fix T46032: Crash w/ file-browser preview
Campbell Barton
noreply at git.blender.org
Mon Sep 7 09:30:30 CEST 2015
Commit: e106a212e8a38588f196fed825ff167515960b5e
Author: Campbell Barton
Date: Mon Sep 7 17:20:09 2015 +1000
Branches: master
https://developer.blender.org/rBe106a212e8a38588f196fed825ff167515960b5e
Fix T46032: Crash w/ file-browser preview
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e71cf0a..6625c91 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6523,6 +6523,7 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
else if (sl->spacetype == SPACE_FILE) {
SpaceFile *sfile = (SpaceFile *)sl;
sfile->op = NULL;
+ sfile->previews_timer = NULL;
}
else if (sl->spacetype == SPACE_ACTION) {
SpaceAction *saction = (SpaceAction *)sl;
@@ -7052,6 +7053,7 @@ static bool direct_link_screen(FileData *fd, bScreen *sc)
sfile->files = NULL;
sfile->layout = NULL;
sfile->op = NULL;
+ sfile->previews_timer = NULL;
sfile->params = newdataadr(fd, sfile->params);
}
else if (sl->spacetype == SPACE_CLIP) {
More information about the Bf-blender-cvs
mailing list