diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-22 00:44:30 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-22 00:44:30 (GMT) |
| commit | 2e48bd149ce70eb5e0f5ade518ff7709708ef49e (patch) | |
| tree | 7b61d7b8bc56b0e1021e26c2832fbcc257259c7a /src/client/Client.cpp | |
| parent | 3c91e526bb5576727e53b98fb850570074f9d036 (diff) | |
| download | powder-2e48bd149ce70eb5e0f5ade518ff7709708ef49e.zip powder-2e48bd149ce70eb5e0f5ade518ff7709708ef49e.tar.gz | |
Stage 2 of autoupdate working
Diffstat (limited to 'src/client/Client.cpp')
| -rw-r--r-- | src/client/Client.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 41c1faf..71bbfc4 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -27,6 +27,8 @@ #include "ClientListener.h" +#include "Update.h" + Client::Client(): authUser(0, ""), updateAvailable(false) @@ -76,19 +78,17 @@ Client::Client(): authUser = User(0, ""); std::cerr << "Error: Client [Read User data from pref] " << e.what() << std::endl; } - try - { - proxyString = ((json::String)(configDocument["Proxy"])).Value(); - } - catch (json::Exception &e) - { - proxyString = ""; - std::cerr << "Error: Client [Read Proxy from pref] " << e.what() << std::endl; - } } configFile.close(); } + if(GetPrefBool("version.update", false)==true) + { + SetPref("version.update", false); + update_finish(); + } + + proxyString = GetPrefString("proxy", ""); if(proxyString.length()) { http_init((char *)proxyString.c_str()); |