From bc510d9de037b665dc96f97da1848d69e5a8b0ed Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Thu, 21 Jan 2010 00:04:59 +0100
Subject: 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.
---
 src/gui/charselectdialog.cpp | 4 ++--
 src/gui/charselectdialog.h   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index e20ec849..66370a79 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -270,10 +270,10 @@ bool CharSelectDialog::selectByName(const std::string &name)
     return false;
 }
 
-void CharSelectDialog::chooseSelected()
+bool CharSelectDialog::chooseSelected()
 {
     if (!mCharInfo->getSize())
-        return;
+        return false;
 
     setVisible(false);
     attemptCharSelect();
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index d16453a6..e2803cfc 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -66,7 +66,12 @@ class CharSelectDialog : public Window, public gcn::ActionListener,
 
         bool selectByName(const std::string &name);
 
-        void chooseSelected();
+        /**
+         * Send selection to character server
+         * @return false if the selection or the number of existing character
+         * is empty.
+         */ 
+        bool chooseSelected();
 
         void update(int slot = -1);
 
-- 
cgit v1.2.3-70-g09d2