From 5562c78ac4933456b4e17e197b98b813bfa747e1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 26 Mar 2014 21:11:39 +0100
Subject: [PATCH] Ask for confirmation when selecting 'New Game'

---
 apps/openmw/mwgui/mainmenu.cpp | 17 ++++++++++++++++-
 apps/openmw/mwgui/mainmenu.hpp |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 4ad260fd9..655663eb6 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -13,6 +13,7 @@
 #include "../mwstate/character.hpp"
 
 #include "savegamedialog.hpp"
+#include "confirmationdialog.hpp"
 
 namespace MWGui
 {
@@ -62,6 +63,11 @@ namespace MWGui
         OEngine::GUI::Layout::setVisible (visible);
     }
 
+    void MainMenu::onNewGameConfirmed()
+    {
+        MWBase::Environment::get().getStateManager()->newGame();
+    }
+
     void MainMenu::onButtonClicked(MyGUI::Widget *sender)
     {
         std::string name = *sender->getUserData<std::string>();
@@ -77,7 +83,16 @@ namespace MWGui
             MWBase::Environment::get().getStateManager()->requestQuit();
         else if (name == "newgame")
         {
-            MWBase::Environment::get().getStateManager()->newGame();
+            if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
+                onNewGameConfirmed();
+            else
+            {
+                ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
+                dialog->open("#{sNotifyMessage54}");
+                dialog->eventOkClicked.clear();
+                dialog->eventOkClicked += MyGUI::newDelegate(this, &MainMenu::onNewGameConfirmed);
+                dialog->eventCancelClicked.clear();
+            }
         }
 
         else
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index 722b329de..f38b2b751 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -32,6 +32,7 @@ namespace MWGui
             std::map<std::string, MWGui::ImageButton*> mButtons;
 
             void onButtonClicked (MyGUI::Widget* sender);
+            void onNewGameConfirmed();
 
             void updateMenu();