Fixed crash when using short versions of server and port command line options

and made sure cancelling the account server connect shows the server dialog.

1 files changed, 20 insertions, 20 deletions

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 36b4a7a0..944b0ae0 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -22,25 +22,25 @@
  */
 
 #include "serverdialog.h"
-

+
 #include <iostream>
-#include <string>

-

-// TODO : Replace the dropdown by our own skinned one.

-#include <guichan/widgets/dropdown.hpp>

-#include <guichan/widgets/label.hpp>

-
-#include "button.h"

-#include "listbox.h"

-#include "ok_dialog.h"

-#include "scrollarea.h"

-#include "textfield.h"

-

-#include "../configuration.h"

-#include "../log.h"

+#include <string>
+
+// TODO : Replace the dropdown by our own skinned one.
+#include <guichan/widgets/dropdown.hpp>
+#include <guichan/widgets/label.hpp>
+
+#include "button.h"
+#include "listbox.h"
+#include "ok_dialog.h"
+#include "scrollarea.h"
+#include "textfield.h"
+
+#include "../configuration.h"
+#include "../log.h"
 #include "../logindata.h"
-#include "../main.h"

-

+#include "../main.h"
+
 #include "../utils/tostring.h"
 
 const short MAX_SERVERLIST = 5;
@@ -238,9 +238,9 @@ ServerDialog::action(const std::string &eventId, gcn::Widget *widget)
                 config.setValue(currentConfig, toString(currentServer.port));
             }
             logger->log("Trying to connect to account server...");
-                Network::connect(Network::ACCOUNT,
-                                  mLoginData->hostname, mLoginData->port);
-                state = STATE_CONNECT_ACCOUNT;
+            Network::connect(Network::ACCOUNT,
+                    mLoginData->hostname, mLoginData->port);
+            state = STATE_CONNECT_ACCOUNT;
         }
     }
     else if (eventId == "cancel")