[Scummvm-cvs-logs] SF.net SVN: scummvm:[35840] scummvm/trunk/gui
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Jan 12 20:56:08 CET 2009
Revision: 35840
http://scummvm.svn.sourceforge.net/scummvm/?rev=35840&view=rev
Author: eriktorbjorn
Date: 2009-01-12 19:56:08 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Fixed bug #2500168 ("GUI: Cannot quit in the launcher's load dialog"). I thought
I would have to do more than this to fix it, but it seems to be enough.
Modified Paths:
--------------
scummvm/trunk/gui/saveload.cpp
scummvm/trunk/gui/saveload.h
Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp 2009-01-12 15:51:11 UTC (rev 35839)
+++ scummvm/trunk/gui/saveload.cpp 2009-01-12 19:56:08 UTC (rev 35840)
@@ -105,6 +105,14 @@
return ret;
}
+void SaveLoadChooser::open() {
+ Dialog::open();
+
+ // So that quitting ScummVM will not cause the dialog result to say a
+ // savegame was selected.
+ setResult(-1);
+}
+
const Common::String &SaveLoadChooser::getResultString() const {
return (_list->getSelected() > -1) ? _list->getSelectedString() : _resultString;
}
Modified: scummvm/trunk/gui/saveload.h
===================================================================
--- scummvm/trunk/gui/saveload.h 2009-01-12 15:51:11 UTC (rev 35839)
+++ scummvm/trunk/gui/saveload.h 2009-01-12 19:56:08 UTC (rev 35840)
@@ -67,6 +67,7 @@
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
void setList(const StringList& list);
int runModal(const EnginePlugin *plugin, const String &target);
+ void open();
const Common::String &getResultString() const;
void setSaveMode(bool saveMode);
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