From f1903004c06de13e15d3b338986dc0212485f09f Mon Sep 17 00:00:00 2001
From: agent-q
Date: Sat, 21 May 2011 15:55:36 +0100
Subject: GUI: Prevent the GUI code from incorrectly reloading the theme when
 the builtin theme is used.

---
 gui/options.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/options.cpp b/gui/options.cpp
index 547ab0f3c6..d2369b9764 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -141,8 +141,8 @@ void OptionsDialog::init() {
 	_subSpeedDesc = 0;
 	_subSpeedSlider = 0;
 	_subSpeedLabel = 0;
-	_oldTheme = ConfMan.get("gui_theme");
-
+	_oldTheme = g_gui.theme()->getThemeId(); 
+	
 	// Retrieve game GUI options
 	_guioptions = 0;
 	if (ConfMan.hasKey("guioptions", _domain)) {
-- 
cgit v1.2.3