From 587e7b299b1d39bc5139a3678cecce0f91381605 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Thu, 16 May 2013 02:19:32 +0200
Subject: Dont drop fonts with ENABLE_FREETYPE=0

---
 src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 7f9ec1ace..d28ba9b9d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2145,7 +2145,9 @@ int main(int argc, char *argv[])
 	*/
 	device->drop();
 
-	delete font;
+#if USE_FREETYPE
+	font->drop();
+#endif
 
 #endif // !SERVER
 	
-- 
cgit v1.2.3


From 714ecc5e27c2c01b0f3ce0ba626abb6baca9af13 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Sat, 18 May 2013 13:01:47 +0200
Subject: Only create SoundManager in main menu if USE_SOUND is true

---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index d28ba9b9d..e5c8a55d3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1845,7 +1845,9 @@ int main(int argc, char *argv[])
 
 					MenuMusicFetcher soundfetcher;
 					ISoundManager *sound = NULL;
+#if USE_SOUND
 					sound = createOpenALSoundManager(&soundfetcher);
+#endif
 					if(!sound)
 						sound = &dummySoundManager;
 					SimpleSoundSpec spec;
-- 
cgit v1.2.3


From c135e9c7d4bfaf038a2236f17f6e246d03461b8a Mon Sep 17 00:00:00 2001
From: elagin <elagin.pasha@gmail.com>
Date: Thu, 31 Jan 2013 21:03:14 +0400
Subject: Save settings after dropping main menu

---
 src/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index e5c8a55d3..eda992793 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1942,6 +1942,9 @@ int main(int argc, char *argv[])
 						sound = NULL;
 					}
 
+					// Save controls status
+					menu->readInput(&menudata);
+
 					infostream<<"Dropping main menu"<<std::endl;
 
 					menu->drop();
-- 
cgit v1.2.3