From cfdb824535a204a6ee1853dd801cad9a2eac92aa Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 12 Jan 2009 19:56:08 +0000
Subject: 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.

svn-id: r35840
---
 gui/saveload.cpp | 8 ++++++++
 gui/saveload.h   | 1 +
 2 files changed, 9 insertions(+)

(limited to 'gui')

diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 29b63a0415..21be09d99e 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -105,6 +105,14 @@ int SaveLoadChooser::runModal(const EnginePlugin *plugin, const String &target)
 	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;
 }
diff --git a/gui/saveload.h b/gui/saveload.h
index 1f9d2d8c75..d1f58b1f59 100644
--- a/gui/saveload.h
+++ b/gui/saveload.h
@@ -67,6 +67,7 @@ public:
 	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);
-- 
cgit v1.2.3