From da92fb470c07376ad0feb2360078edd1a9124141 Mon Sep 17 00:00:00 2001
From: Johannes Schickel <lordhoto@scummvm.org>
Date: Sun, 14 Sep 2008 19:16:08 +0000
Subject: [PATCH] Fix for bug #2090879 "GUI: Launcher 'Load' dialog should
 preserve save slot index".

svn-id: r34534
---
 gui/launcher.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 8a0b712031d..6e66c819cdc 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -513,7 +513,7 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel)
 
 	// Add choice list
 	_list = new GUI::ListWidget(this, "scummsaveload_list");
-	_list->setNumberingMode(GUI::kListNumberingZero);
+	_list->setNumberingMode(GUI::kListNumberingOff);
 
 	_container = new GUI::ContainerWidget(this, 0, 0, 10, 10);
 	_container->setHints(GUI::THEME_HINT_USE_SHADOW);
@@ -625,8 +625,13 @@ void SaveLoadChooser::updateSaveList() {
 	_saveList = (*_plugin)->listSaves(_target.c_str());
 
 	StringList saveNames;
-	for (SaveStateList::const_iterator x = _saveList.begin(); x != _saveList.end(); ++x)
-		saveNames.push_back(x->description());
+	for (SaveStateList::const_iterator x = _saveList.begin(); x != _saveList.end(); ++x) {
+		Common::String description = x->save_slot();
+		description += ". ";
+		description += x->description();
+
+		saveNames.push_back(description);
+	}
 	_list->setList(saveNames);
 }