diff options
author | Bertram <bertram@cegetel.net> | 2010-01-21 00:04:59 +0100 |
---|---|---|
committer | Bertram <bertram@cegetel.net> | 2010-01-21 00:04:59 +0100 |
commit | bc510d9de037b665dc96f97da1848d69e5a8b0ed (patch) | |
tree | 139c592b8fd7971ff1da8ea9750ba7f56f2c8b15 /src/main.cpp | |
parent | 3fb3480ef461c7fa2e1f44142f4d37d80d87e087 (diff) | |
download | mana-client-bc510d9de037b665dc96f97da1848d69e5a8b0ed.tar.gz mana-client-bc510d9de037b665dc96f97da1848d69e5a8b0ed.tar.bz2 mana-client-bc510d9de037b665dc96f97da1848d69e5a8b0ed.tar.xz mana-client-bc510d9de037b665dc96f97da1848d69e5a8b0ed.zip |
Corrected the --default option behaviour to follow --help definition.
The --help options tells:
-D --default : Choose default character server and character
The client now choose the defaulted last character entry when --default is set.
The --character option still has precedence.
Also added a return value to the CharSelectDialog->chooseSelected() function while on it,
in case of someone willing to add errors handling at this stage.
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 69b45091..af1057a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1073,8 +1073,12 @@ int main(int argc, char *argv[]) } else { - ((CharSelectDialog*) currentDialog)->selectByName( - config.getValue("lastCharacter", "")); + if (((CharSelectDialog*) currentDialog)->selectByName( + config.getValue("lastCharacter", ""))) + { + if (options.chooseDefault) + ((CharSelectDialog*) currentDialog)->chooseSelected(); + } } break; |