src/gui/char_select.cpp, src/main.cpp: Fix the character name matching loop and add support for saving the last used character (based on a patch by Andrew Harrison).

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0d4b54d7..08fc7a56 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -468,6 +468,10 @@ void charLogin(Network *network, LoginData *loginData)
 
 void mapLogin(Network *network, LoginData *loginData)
 {
+    logger->log("Memorizing selected character %s",
+            player_node->getName().c_str());
+    config.setValue("lastCharacter", player_node->getName());
+
     MessageOut outMsg(network);
 
     logger->log("Trying to connect to map server...");
@@ -657,6 +661,9 @@ int main(int argc, char *argv[])
                     if (((CharSelectDialog*)currentDialog)->
                             selectByName(options.playername))
                         options.chooseDefault = true;
+                    else
+                        ((CharSelectDialog*)currentDialog)->selectByName(
+                            config.getValue("lastCharacter", ""));
 
                     if (options.chooseDefault)
                         ((CharSelectDialog*)currentDialog)->action("ok", NULL);