From d9a1ce3de9578a8d89e5dd0d0a53417582e61212 Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Mon, 25 Jan 2010 13:28:03 +0000
Subject: [PATCH] No deactivation, push main view on activation

---
 Src/gui/gui.cpp | 9 +--------
 Src/gui/gui.hh  | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Src/gui/gui.cpp b/Src/gui/gui.cpp
index 66567d0..8b3766b 100644
--- a/Src/gui/gui.cpp
+++ b/Src/gui/gui.cpp
@@ -221,7 +221,6 @@ bool Gui::setTheme(const char *path)
 		this->tv = new ThemeView();
 		this->bkv = new BindKeysView();
 		this->giv = new GameInfoView();
-		this->pushView(mv);
 	}
 
 	VirtualKeyboard::kbd->updateTheme();
@@ -342,13 +341,7 @@ void Gui::activate()
 	this->is_active = true;
 	/* FIXME! TMP! TMP! */
 	this->np = new Prefs();
-}
-
-void Gui::deActivate()
-{
-	/* FIXME! TMP! TMP! */
-	delete this->np;
-	this->is_active = false;
+	this->pushView(this->mv);
 }
 
 SDL_Surface *Gui::loadThemeImage(const char *dir, const char *what)
diff --git a/Src/gui/gui.hh b/Src/gui/gui.hh
index 9bdd396..edd226f 100644
--- a/Src/gui/gui.hh
+++ b/Src/gui/gui.hh
@@ -39,8 +39,6 @@ public:
 
 	void activate();
 
-	void deActivate();
-
 	void runLogic(void);
 
 	void pushEvent(SDL_Event *ev);