diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index c0fc98be..baa0a143 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -5937,6 +5937,12 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ ) switch (t) { case Menu::mainmenu: + if (ingame_titlemode) + { + /* We shouldn't be here! */ + SDL_assert(0 && "Entering main menu from in-game options!"); + break; + } #if !defined(MAKEANDPLAY) option("play"); #endif diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 5696e7a4..ee4c0ba1 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -288,6 +288,13 @@ static void startmode(const int mode) static void handlefadetomode(void) { + if (game.ingame_titlemode) + { + /* We shouldn't be here! */ + SDL_assert(0 && "Loading a mode from in-game options!"); + return; + } + if (fadetomodedelay > 0) { --fadetomodedelay;