blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T59946: multiple quit dialogs possible. 

Differential Revision: https://developer.blender.org/D4147
This commit is contained in:
Sebastian Parborg 2019-01-04 14:23:49 +01:00 committed by Brecht Van Lommel
parent f2ebb7bb79
commit e571f0255f
Notes: blender-bot 2023-02-14 05:59:31 +01:00 
Referenced by issue #59946, Multiple quit dialogs possible
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/UI_interface.h
View File

@ -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

16
source/blender/editors/interface/interface_region_menu_popup.c
View File

@ -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;
}
/** \} */

4
source/blender/windowmanager/intern/wm_window.c
View File

@ -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);