From 4be7258f003ea6894bfe28173246279393ea19ec Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 May 2015 18:00:53 +1000 Subject: WM: remove windows if they fail to initialize --- source/blender/windowmanager/intern/wm_window.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 9bcbbabc87b..6d1bf51902c 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -615,12 +615,22 @@ void WM_window_open_temp(bContext *C, rcti *position, int type) /* operator callback */ int wm_window_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) { - wm_window_copy(C, CTX_wm_window(C)); + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win_src = CTX_wm_window(C); + wmWindow *win_dst; + + win_dst = wm_window_copy(C, win_src); + WM_check(C); - - WM_event_add_notifier(C, NC_WINDOW | NA_ADDED, NULL); - - return OPERATOR_FINISHED; + + if (win_dst->ghostwin) { + WM_event_add_notifier(C, NC_WINDOW | NA_ADDED, NULL); + return OPERATOR_FINISHED; + } + else { + wm_window_close(C, wm, win_dst); + return OPERATOR_CANCELLED; + } } -- cgit v1.2.3