diff options
| author | matthijs <matthijs@openttd.org> | 2005-02-03 19:23:06 +0000 |
|---|---|---|
| committer | matthijs <matthijs@openttd.org> | 2005-02-03 19:23:06 +0000 |
| commit | f42e8ac3d2b490f7391f86a0c686637cd73e6763 (patch) | |
| tree | 89e4b2702d7e529b211aa6ba7c81cc98793be9cd | |
| parent | 0601293edb1bd854ad304c9777c3d90864db76fe (diff) | |
| download | openttd-f42e8ac3d2b490f7391f86a0c686637cd73e6763.tar.xz | |
(svn r1778) - Fix: [ 1115200 ] In the main menu, when starting a new game while the load game dialog is open, openttd asserts.
| -rw-r--r-- | misc_gui.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/misc_gui.c b/misc_gui.c index f60c85f13..53bdc0f7e 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -1259,8 +1259,8 @@ static void SaveLoadDlgWndProc(Window *w, WindowEvent *e) } break; case WE_DESTROY: - // pause is only used in single-player, non-editor mode - if(!_networking && (_game_mode != GM_EDITOR)) + // pause is only used in single-player, non-editor mode, non menu mode + if(!_networking && (_game_mode != GM_EDITOR) && (_game_mode != GM_MENU)) DoCommandP(0, 0, 0, NULL, CMD_PAUSE); _query_string_active = false; FiosFreeSavegameList(); @@ -1350,7 +1350,8 @@ void ShowSaveLoadDialog(int mode) strcpy(_edit_str_buf, "UNNAMED"); } - // pause is only used in single-player, non-editor mode + // pause is only used in single-player, non-editor mode, non-menu mode. It + // will be unpaused in the WE_DESTROY event handler. if(_game_mode != GM_MENU && !_networking && _game_mode != GM_EDITOR) DoCommandP(0, 1, 0, NULL, CMD_PAUSE); |