diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-22 14:19:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-22 14:19:02 +0300 |
| commit | 82d13ad99996c5e7432e3aa15c547b2231bea2f7 (patch) | |
| tree | e07bc7cb0136f805cdfa97f7eaddecced6924dd0 /source/blender/windowmanager/intern/wm_window.c | |
| parent | d2a721cfd5d88efb4ea09fb557bf4737c959ff83 (diff) | |
add missing mem-free on vertex group sorting & dont crash when calling fullscreen in bg mode.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index be33264cafd..a02ce3fe554 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -528,7 +528,12 @@ int wm_window_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) int wm_window_fullscreen_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { wmWindow *window= CTX_wm_window(C); - GHOST_TWindowState state = GHOST_GetWindowState(window->ghostwin); + GHOST_TWindowState state; + + if(G.background) + return OPERATOR_CANCELLED; + + state= GHOST_GetWindowState(window->ghostwin); if(state!=GHOST_kWindowStateFullScreen) GHOST_SetWindowState(window->ghostwin, GHOST_kWindowStateFullScreen); else |