[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23536] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix #19479: ctrl+N could temporarily freeze the window when user

[Brecht Van Lommel]

Revision: 23536
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23536
Author:   blendix
Date:     2009-09-28 17:34:15 +0200 (Mon, 28 Sep 2009)

Log Message:
-----------
Fix #19479: ctrl+N could temporarily freeze the window when user
preferences were saved from a separate window. Missing transfor of
active window state to the new window.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2009-09-28 15:14:52 UTC (rev 23535)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2009-09-28 15:34:15 UTC (rev 23536)
@@ -195,6 +195,7 @@
 
 			/* ensure making new keymaps and set space types */
 			wm->initialized= 0;
+			wm->winactive= NULL;
 			
 			/* only first wm in list has ghostwins */
 			for(win= wm->windows.first; win; win= win->next) {
@@ -202,6 +203,10 @@
 					
 					if(oldwin->winid == win->winid ) {
 						win->ghostwin= oldwin->ghostwin;
+						win->active= oldwin->active;
+						if(win->active)
+							wm->winactive= win;
+
 						GHOST_SetWindowUserData(win->ghostwin, win);	/* pointer back */
 						oldwin->ghostwin= NULL;