blender-crash-fix.patch
Public
Actions

Authored By

	Ola Jeppsson (olajep)
	Nov 13 2013, 3:27 PM

Size

1 KB

Subscribers

None

blender-crash-fix.patch
View Options

	diff -Naur blender-2.60/source/blender/windowmanager/intern/wm_files.c blender-2.60b/source/blender/windowmanager/intern/wm_files.c
	--- blender-2.60/source/blender/windowmanager/intern/wm_files.c 2011-10-19 17:01:57.000000000 +0200
	+++ blender-2.60b/source/blender/windowmanager/intern/wm_files.c 2011-10-21 00:40:15.323848172 +0200
	@@ -198,23 +198,23 @@
	/* when loading without UI, no matching needed */
	if(!(G.fileflags & G_FILE_NO_UI)) {
	bScreen *screen= CTX_wm_screen(C);
	-
	+ if (screen != NULL) {
	/* match oldwm to new dbase, only old files */
	- for(wm= oldwmlist->first; wm; wm= wm->id.next) {
	+ for(wm= oldwmlist->first; wm; wm= wm->id.next) {

	- for(win= wm->windows.first; win; win= win->next) {
	- /* all windows get active screen from file */
	- if(screen->winid==0)
	- win->screen= screen;
	- else
	- win->screen= ED_screen_duplicate(win, screen);
	+ for(win= wm->windows.first; win; win= win->next) {
	+ /* all windows get active screen from file */
	+ if(screen->winid==0)
	+ win->screen= screen;
	+ else
	+ win->screen= ED_screen_duplicate(win, screen);

	- BLI_strncpy(win->screenname, win->screen->id.name+2, sizeof(win->screenname));
	- win->screen->winid= win->winid;
	+ BLI_strncpy(win->screenname, win->screen->id.name+2, sizeof(win->screenname));
	+ win->screen->winid= win->winid;
	+ }
	}
	}
	}
	-
	G.main->wm= *oldwmlist;

	/* screens were read from file! */