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

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sat Jul 22 23:23:56 CEST 2006


Revision: 23571
Author:   eriktorbjorn
Date:     2006-07-22 14:23:49 -0700 (Sat, 22 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23571&view=rev

Log Message:
-----------
Clear the active domain when (re)opening the launcher dialog. This fixes bug
#1523050.

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/launcher.h
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2006-07-22 18:39:41 UTC (rev 23570)
+++ scummvm/trunk/gui/launcher.cpp	2006-07-22 21:23:49 UTC (rev 23571)
@@ -540,6 +540,14 @@
 	delete _browser;
 }
 
+void LauncherDialog::open() {
+	// Clear the active domain, in case we return to the dialog from a
+	// failure to launch a game. Otherwise, pressing ESC will attempt to
+	// re-launch the same game again.
+	ConfMan.setActiveDomain("");
+	Dialog::open();
+}
+
 void LauncherDialog::close() {
 	// Save last selection
 	const int sel = _list->getSelected();

Modified: scummvm/trunk/gui/launcher.h
===================================================================
--- scummvm/trunk/gui/launcher.h	2006-07-22 18:39:41 UTC (rev 23570)
+++ scummvm/trunk/gui/launcher.h	2006-07-22 21:23:49 UTC (rev 23571)
@@ -56,6 +56,7 @@
 	void updateListing();
 	void updateButtons();
 
+	void open();
 	void close();
 	virtual void addGame();
 	void removeGame(int item);


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





More information about the Scummvm-git-logs mailing list