Added ReturnToMainMenuDelegate to GameState and connect it in GameViewContainer

Author: oscar139

appOPHD/States/GameState.cpp

@@ -89,6 +89,12 @@ GameState::~GameState()
 }
 
 
+GameState::ReturnToMainMenuDelegate GameState::onReturnToMainMenuDelegate()
+{
+	return {&mMapViewState, &MapViewState::onGameOver};
+}
+
+
 void GameState::initializeGameState()
 {
 	mMainReportsState.initialize();

appOPHD/States/MapViewState.cpp

@@ -251,8 +251,6 @@ MapViewState::~MapViewState()
 	eventHandler.windowResized().disconnect({this, &MapViewState::onWindowResized});
 
 	NAS2D::Utility<std::map<class MineFacility*, Route>>::get().clear();
-
-	mGameOptionsDialog.returnToMainMenuButtonSignal().disconnect({this, &MapViewState::onGameOver});
 }
 
 

appOPHD/States/MapViewState.h

@@ -130,6 +130,8 @@ class MapViewState : public Wrapper
 
 	void save(const std::string& filePath);
 
+	void onGameOver();
+
 private:
 	void onDeactivate() override;
 	void onActivate() override;
@@ -269,8 +271,6 @@ class MapViewState : public Wrapper
 
 	void onNotificationClicked(const NotificationArea::Notification&);
 
-	void onGameOver();
-
 	void onStructuresSelectionChange(const IconGrid::Item*);
 	void onConnectionsSelectionChange(const IconGrid::Item*);
 	void onRobotsSelectionChange(const IconGrid::Item*);

appOPHD/States/MapViewStateUi.cpp

@@ -85,8 +85,6 @@ void MapViewState::initUi()
 	mGameOverDialog.returnToMainMenu().connect({this, &MapViewState::onGameOver});
 	mGameOverDialog.hide();
 
-	mGameOptionsDialog.returnToMainMenuButtonSignal().connect({this, &MapViewState::onGameOver});
-
 	mAnnouncement.hide();
 	mMineOperationsWindow.hide();
 	mWarehouseInspector.hide();

appOPHD/UI/GameViewContainer.cpp

@@ -11,6 +11,7 @@ GameViewContainer::GameViewContainer(GameState& gameState) :
 
 	mGameOptionsDialog.saveGameDialogButtonSignal().connect({this, &GameViewContainer::showSaveDialog});
 	mGameOptionsDialog.loadGameDialogButtonSignal().connect({this, &GameViewContainer::showLoadDialog});
+	mGameOptionsDialog.returnToMainMenuButtonSignal().connect(gameState.onReturnToMainMenuDelegate());
 
 	mFileIoDialog.hide();
 	mFileIoDialog.anchored(true);