Fix update handling

THis will prevent loading updates when -u is used, and prevent error
messages in the log when -u is used.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 06ec2f75..f7468d84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -586,6 +586,7 @@ void parseOptions(int argc, char *argv[], Options &options)
  */
 void loadUpdates()
 {
+    if (updatesDir.empty()) return;
     const std::string updatesFile = "/" + updatesDir + "/resources2.txt";
     ResourceManager *resman = ResourceManager::getInstance();
     std::vector<std::string> lines = resman->loadTextFile(updatesFile);
@@ -971,8 +972,7 @@ int main(int argc, char *argv[])
                     }
                     else
                     {
-                        int nextState = (options.skipUpdate) ?
-                            LOADDATA_STATE : UPDATE_STATE;
+                        int nextState = UPDATE_STATE;
                         currentDialog = new ServerSelectDialog(&loginData,
                                                                 nextState);
                         positionDialog(currentDialog, screenWidth,
@@ -1032,18 +1032,18 @@ int main(int argc, char *argv[])
                     break;
 
                 case UPDATE_STATE:
-                    // Determine which source to use for the update host
-                    if (!options.updateHost.empty())
-                        updateHost = options.updateHost;
-                    else
-                        updateHost = loginData.updateHost;
-
-                    setUpdatesDir();
-                    logger->log("State: UPDATE");
-
                     if (options.skipUpdate) {
                         state = LOADDATA_STATE;
                     } else {
+                        // Determine which source to use for the update host
+                        if (!options.updateHost.empty())
+                            updateHost = options.updateHost;
+                        else
+                            updateHost = loginData.updateHost;
+
+                        setUpdatesDir();
+                        logger->log("State: UPDATE");
+
                         currentDialog = new UpdaterWindow(updateHost,
                                                 homeDir + "/" + updatesDir);
                         positionDialog(currentDialog, screenWidth,