From e7763700e2e2016f4573e3feb77b5fab69268683 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Sun, 5 Jun 2016 15:44:05 +0600 Subject: CLOUD: Make Save/Load dialog start saves sync It also shows a "sync disabled" icon in case it has a savepath override. --- gui/saveload.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gui/saveload.cpp') diff --git a/gui/saveload.cpp b/gui/saveload.cpp index b94d30289b..b3e669899f 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -87,6 +87,8 @@ int SaveLoadChooser::runModalWithPluginAndTarget(const EnginePlugin *plugin, con if (!_impl) return -1; + _impl->runSaveSync(ConfMan.hasKey("savepath", target)); + // Set up the game domain as newly active domain, so // target specific savepath will be checked String oldDomain = ConfMan.getActiveDomainName(); -- cgit v1.2.3 From 81c85b6651fcb4ba2f1dc0ba2955e34cb541fc35 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Tue, 5 Jul 2016 13:30:24 +0600 Subject: CLOUD: Fix SaveLoadDialogs to check USE_CLOUD Linking was failing when disabling curl support. --- gui/saveload.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gui/saveload.cpp') diff --git a/gui/saveload.cpp b/gui/saveload.cpp index b3e669899f..b08ab7fd1a 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -87,7 +87,9 @@ int SaveLoadChooser::runModalWithPluginAndTarget(const EnginePlugin *plugin, con if (!_impl) return -1; +#ifdef USE_CLOUD _impl->runSaveSync(ConfMan.hasKey("savepath", target)); +#endif // Set up the game domain as newly active domain, so // target specific savepath will be checked -- cgit v1.2.3 From 3da38ca60b65d3f1bd67b049f3c4b2a90a4d6a19 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Tue, 5 Jul 2016 15:05:30 +0600 Subject: CLOUD: Replace USE_CLOUD with USE_LIBCURL In most cases that's the right one to check. USE_CLOUD is defined when either USE_LIBCURL or USE_SDL_NET are, which means if there is no curl, USE_CLOUD still could be defined and linking errors would appear. --- gui/saveload.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/saveload.cpp') diff --git a/gui/saveload.cpp b/gui/saveload.cpp index b08ab7fd1a..3072aa6082 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -87,7 +87,7 @@ int SaveLoadChooser::runModalWithPluginAndTarget(const EnginePlugin *plugin, con if (!_impl) return -1; -#ifdef USE_CLOUD +#ifdef USE_LIBCURL _impl->runSaveSync(ConfMan.hasKey("savepath", target)); #endif -- cgit v1.2.3