Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21472) -Fix [FS#4298] (r21459-ish): make sure the query window is only opened once per parent window / callback.

Browse Source
This commit is contained in:
rubidium 2010-12-11 20:38:37 +00:00
parent 293ede7bdf
commit 9bc1e35625
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/misc_gui.cpp
View File

@ -1483,7 +1483,6 @@ struct QueryWindow : public Window {
this->InitNested(desc); this->InitNested(desc);
if (parent == NULL) parent = FindWindowById(WC_MAIN_WINDOW, 0);
this->parent = parent; this->parent = parent;
this->left = parent->left + (parent->width / 2) - (this->width / 2); this->left = parent->left + (parent->width / 2) - (this->width / 2);
this->top = parent->top + (parent->height / 2) - (this->height / 2); this->top = parent->top + (parent->height / 2) - (this->height / 2);
@ -1599,5 +1598,18 @@ static const WindowDesc _query_desc(
*/ */
void ShowQuery(StringID caption, StringID message, Window *parent, QueryCallbackProc *callback) void ShowQuery(StringID caption, StringID message, Window *parent, QueryCallbackProc *callback)
{ {
if (parent == NULL) parent = FindWindowById(WC_MAIN_WINDOW, 0);
const Window *w;
FOR_ALL_WINDOWS_FROM_BACK(w) {
if (w->window_class != WC_CONFIRM_POPUP_QUERY) continue;
const QueryWindow *qw = (const QueryWindow *)w;
if (qw->parent != parent || qw->proc != callback) continue;
delete qw;
break;
}
new QueryWindow(&_query_desc, caption, message, parent, callback); new QueryWindow(&_query_desc, caption, message, parent, callback);
} }