diff options
| author | Alexander Tkachev | 2016-06-01 16:22:42 +0600 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | b3bf5322117d03c003011839ea1e7897c48183fa (patch) | |
| tree | 7991bd7d812bcc9dbd4dfd078a55b16f7ec8e0ba /base | |
| parent | 1f974a7a2a2073074391fbf090d2bf909006e773 (diff) | |
| download | scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.tar.gz scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.tar.bz2 scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.zip | |
CLOUD: Make CloudManager singleton
It's needed to ::destroy() it in main().
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp index aede61790c..4edc7a957a 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -66,7 +66,9 @@ #endif #include "backends/keymapper/keymapper.h" -#include "common/cloudmanager.h" +#ifdef USE_CLOUD +#include "backends/cloud/cloudmanager.h" +#endif #ifdef USE_LIBCURL #include "backends/networking/curl/connectionmanager.h" #endif @@ -481,9 +483,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { #endif #ifdef USE_CLOUD - system.getCloudManager()->init(); - system.getCloudManager()->syncSaves(); - system.getCloudManager()->testFeature(); //TODO: remove later + CloudMan.init(); + CloudMan.syncSaves(); + CloudMan.testFeature(); //TODO: remove later #endif // Unless a game was specified, show the launcher dialog @@ -597,6 +599,10 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { #ifdef USE_LIBCURL Networking::ConnectionManager::destroy(); #endif +#ifdef USE_CLOUD + //I think it's important to destroy it after ConnectionManager + Cloud::CloudManager::destroy(); +#endif PluginManager::instance().unloadAllPlugins(); PluginManager::destroy(); GUI::GuiManager::destroy(); |