diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 058e8e6e..9e2e8765 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -5905,6 +5905,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 c5e0481f..779ec718 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -290,6 +290,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;