Merge branch 'improved_breakdowns' into jgrpp
# Conflicts: # src/vehiclelist.cpp
This commit is contained in:
@@ -1052,10 +1052,12 @@ struct QueryStringWindow : public Window
|
||||
switch (widget) {
|
||||
case WID_QS_DEFAULT:
|
||||
this->editbox.text.DeleteAll();
|
||||
/* FALL THROUGH */
|
||||
FALLTHROUGH;
|
||||
|
||||
case WID_QS_OK:
|
||||
this->OnOk();
|
||||
/* FALL THROUGH */
|
||||
FALLTHROUGH;
|
||||
|
||||
case WID_QS_CANCEL:
|
||||
delete this;
|
||||
break;
|
||||
@@ -1205,7 +1207,8 @@ struct QueryWindow : public Window {
|
||||
this->proc(this->parent, true);
|
||||
this->proc = NULL;
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
FALLTHROUGH;
|
||||
|
||||
case WKC_ESC:
|
||||
delete this;
|
||||
return ES_HANDLED;
|
||||
|
Reference in New Issue
Block a user