[Scummvm-cvs-logs] SF.net SVN: scummvm: [27312] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 27312
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27312&view=rev
Author:   fingolfin
Date:     2007-06-10 07:23:26 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Oops, fix crash when opening globals options dialog

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2007-06-10 13:56:10 UTC (rev 27311)
+++ scummvm/trunk/gui/launcher.cpp	2007-06-10 14:23:26 UTC (rev 27312)
@@ -302,6 +302,11 @@
 
 	OptionsDialog::reflowLayout();
 
+	// FIXME/HACK to workaround bug #1677997, part #2
+	{
+		loadConfigToWidgets();
+	}
+
 	int labelWidth = g_gui.evaluator()->getVar("gameOptionsLabelWidth");
 
 	if (_langPopUp)

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2007-06-10 13:56:10 UTC (rev 27311)
+++ scummvm/trunk/gui/options.cpp	2007-06-10 14:23:26 UTC (rev 27312)
@@ -666,6 +666,15 @@
 
 GlobalOptionsDialog::GlobalOptionsDialog()
 	: OptionsDialog(Common::ConfigManager::kApplicationDomain, "globaloptions") {
+
+#ifdef SMALL_SCREEN_DEVICE
+	_keysDialog = 0;
+#endif
+	_savePath = 0;
+	_themePath = 0;
+	_extraPath = 0;
+	_curTheme = 0;
+	_autosavePeriodPopUp = 0;
 	
 	// FIXME: Disable the setupWidgets() call here for now. See reflowLayout()
 	// for details.
@@ -779,10 +788,14 @@
 		_focusedWidget = 0;
 		_dragWidget = 0;
 		setupWidgets();
-		loadConfigToWidgets();
 	}
 
 	OptionsDialog::reflowLayout();
+
+	// FIXME/HACK to workaround bug #1677997, part #2
+	{
+		loadConfigToWidgets();
+	}
 }
 
 void GlobalOptionsDialog::loadConfigToWidgets() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.