diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx index 110a38cc..6f9e1be9 100644 --- a/src/MarbleGame.hx +++ b/src/MarbleGame.hx @@ -53,6 +53,7 @@ class MarbleGame { var console:ConsoleDlg; var _mouseWheelDelta:Float; + var _exitingToMenu:Bool = false; public function new(scene2d:h2d.Scene, scene:h3d.scene.Scene) { Console.log("Initializing the game..."); @@ -289,7 +290,12 @@ class MarbleGame { #end } else { var pmg = new LevelSelectGui(LevelSelectGui.currentDifficultyStatic); - canvas.setContent(pmg); + if (_exitingToMenu) { + _exitingToMenu = false; + canvas.setContent(new MainMenuGui()); + } else { + canvas.setContent(pmg); + } } Settings.save(); diff --git a/src/gui/ExitGameDlg.hx b/src/gui/ExitGameDlg.hx index 4a165e55..63bef34e 100644 --- a/src/gui/ExitGameDlg.hx +++ b/src/gui/ExitGameDlg.hx @@ -99,8 +99,8 @@ class ExitGameDlg extends GuiImage { btnList.addButton(4, "Main Menu", (evt) -> { MarbleGame.canvas.pushDialog(new MessageBoxYesNoDlg("Are you sure you want to exit this level? You will lose your current level progress.", () -> { + MarbleGame.instance._exitingToMenu = true; yesFunc(btnList); - MarbleGame.canvas.setContent(new MainMenuGui()); }, () -> {})); }); } diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index 2d59363f..8a0557b5 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -37,6 +37,8 @@ class MainMenuGui extends GuiImage { var scene2d = MarbleGame.instance.scene2d; #end + MarbleGame.instance.toRecord = false; + var offsetX = (scene2d.width - 1280) / 2; var offsetY = (scene2d.height - 720) / 2;