[Bf-blender-cvs] [e571f0255f2] master: Fix T59946: multiple quit dialogs possible.

[Sebastian Parborg]

Commit: e571f0255f2b045efb0525ebe104322bc331d584
Author: Sebastian Parborg
Date:   Fri Jan 4 14:23:49 2019 +0100
Branches: master
https://developer.blender.org/rBe571f0255f2b045efb0525ebe104322bc331d584

Fix T59946: multiple quit dialogs possible.

Differential Revision: https://developer.blender.org/D4147

===================================================================

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_region_menu_popup.c
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index c525d9cffe6..2e31a1a9ae5 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -493,6 +493,8 @@ void UI_popup_block_ex(struct bContext *C, uiBlockCreateFunc func, uiBlockHandle
 
 void UI_popup_block_close(struct bContext *C, struct wmWindow *win, uiBlock *block);
 
+bool UI_popup_block_name_exists(struct bContext *C, const char *name);
+
 /* Blocks
  *
  * Functions for creating, drawing and freeing blocks. A Block is a
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index bdac03de86b..e136614d30e 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -648,4 +648,20 @@ void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block)
 	}
 }
 
+bool UI_popup_block_name_exists(bContext *C, const char *name)
+{
+	bScreen *sc = CTX_wm_screen(C);
+	uiBlock *block;
+	ARegion *ar;
+
+	for (ar = sc->regionbase.first; ar; ar = ar->next) {
+		for (block = ar->uiblocks.first; block; block = block->next) {
+			if (STREQ(block->name, name)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 /** \} */
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 8be35c10ae9..281a556a62d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -444,7 +444,9 @@ static void wm_confirm_quit(bContext *C)
 	wmWindow *win = CTX_wm_window(C);
 
 	if (GHOST_SupportsNativeDialogs() == 0) {
-		UI_popup_block_invoke(C, block_create_confirm_quit, NULL);
+		if (!UI_popup_block_name_exists(C, "confirm_quit_popup")) {
+			UI_popup_block_invoke(C, block_create_confirm_quit, NULL);
+		}
 	}
 	else if (GHOST_confirmQuit(win->ghostwin)) {
 		wm_exit_schedule_delayed(C);