From ec98056c4262b6a491e2467ca0accb85ed8f0788 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 3 May 2009 11:33:46 +0200
Subject: Don't choose default character server when given a character name

Just cause a character name was given on the command line doesn't mean
we should pick any random character server. For the latter we have -D.
---
 src/main.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 6721b8f0..9c8e2dca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1426,8 +1426,7 @@ int main(int argc, char *argv[])
                                                                 nextState);
                         positionDialog(currentDialog, screenWidth,
                                                       screenHeight);
-                        if (options.chooseDefault
-                                || !options.character.empty())
+                        if (options.chooseDefault)
                         {
                             ((ServerSelectDialog*) currentDialog)->action(
                                 gcn::ActionEvent(NULL, "ok"));
-- 
cgit v1.2.3-70-g09d2