diff options
| author | Lloyd Bryant <lloyd_bryant@netzero.net> | 2008-08-09 06:34:41 +0000 |
|---|---|---|
| committer | Lloyd Bryant <lloyd_bryant@netzero.net> | 2008-08-09 06:34:41 +0000 |
| commit | 3b9bd9ea1a54f312848b20a889498eb1f6e3bf44 (patch) | |
| tree | ed7dc6524fbdd9d97d1027c92c31cc0ec805b2cc | |
| parent | 0f033c073c7ae630c9359da358128f5f425f01a6 (diff) | |
| download | mana-3b9bd9ea1a54f312848b20a889498eb1f6e3bf44.tar.gz mana-3b9bd9ea1a54f312848b20a889498eb1f6e3bf44.tar.bz2 mana-3b9bd9ea1a54f312848b20a889498eb1f6e3bf44.tar.xz mana-3b9bd9ea1a54f312848b20a889498eb1f6e3bf44.zip | |
Changed --skipupdate functionality to just skip the actual downloads
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/main.cpp | 25 |
2 files changed, 18 insertions, 12 deletions
@@ -1,3 +1,8 @@ +2008-08-08 Lloyd Bryant ("Sanga") <lloyd_bryant@netzero.net> + + * Made "--skipupdate" skip the update download process, but + still load whatever updates have been previously downloaded. + 2008-07-25 Lloyd Bryant ("Sanga") <lloyd_bryant@netzero.net> * Added feature to remember window locations from one diff --git a/src/main.cpp b/src/main.cpp index f8e3d3c0..89bc8e6b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -426,7 +426,7 @@ void printHelp() << "Options: " << std::endl << " -h --help : Display this help" << std::endl << " -v --version : Display the version" << std::endl - << " -u --skipupdate : Skip the update process" << std::endl + << " -u --skipupdate : Skip the update downloads" << std::endl << " -U --username : Login with this username" << std::endl << " -P --password : Login with this password" << std::endl << " -D --default : Bypass the login process with default " @@ -757,15 +757,11 @@ int main(int argc, char *argv[]) switch (oldstate) { case UPDATE_STATE: - if (options.skipUpdate) { - state = LOADDATA_STATE; - } else { - loadUpdates(); - // Reload the wallpaper in case that it was updated - login_wallpaper->decRef(); - login_wallpaper = ResourceManager::getInstance()-> - getImage("graphics/images/login_wallpaper.png"); - } + loadUpdates(); + // Reload the wallpaper in case that it was updated + login_wallpaper->decRef(); + login_wallpaper = ResourceManager::getInstance()-> + getImage("graphics/images/login_wallpaper.png"); break; // Those states don't cause a network disconnect @@ -890,8 +886,13 @@ int main(int argc, char *argv[]) setUpdatesDir(); logger->log("State: UPDATE"); - currentDialog = new UpdaterWindow(updateHost, - homeDir + "/" + updatesDir); + + if (options.skipUpdate) { + state = LOADDATA_STATE; + } else { + currentDialog = new UpdaterWindow(updateHost, + homeDir + "/" + updatesDir); + } break; case ERROR_STATE: |