Fix unitialised variable occassionally being used
authorCraig Robbins <kde.psych@gmail.com>
Sat, 24 Jan 2015 04:22:50 +0000 (14:22 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Sat, 24 Jan 2015 04:54:42 +0000 (14:54 +1000)
src/game.cpp

index af744dcbb92ce8dc0e211de0a7f0863587eef6ed..f5a19a7e438ab1faf68ee042de33fa83238986c6 100644 (file)
@@ -2116,6 +2116,9 @@ bool Game::connectToServer(const std::string &playername,
                const std::string &password, std::string *address, u16 port,
                bool *connect_ok, bool *aborted)
 {
+       *connect_ok = false;    // Let's not be overly optimistic
+       *aborted = false;
+
        showOverlayMessage("Resolving address...", 0, 15);
 
        Address connect_address(0, 0, 0, 0, port);
@@ -2158,14 +2161,12 @@ bool Game::connectToServer(const std::string &playername,
 
        gamedef = client;       // Client acts as our GameDef
 
-
        infostream << "Connecting to server at ";
        connect_address.print(&infostream);
        infostream << std::endl;
 
        client->connect(connect_address);
 
-
        /*
                Wait for server to accept connection
        */