[Scummvm-git-logs] scummvm master -> 6b0766dc92337d3b95a7a349f204123213b4b733

[Tkachov]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f8fe150130 CLOUD: Fix Webserver's usage of DefaultSaveFileManager
6b0766dc92 Merge branch 'master' of https://github.com/scummvm/scummvm


Commit: f8fe150130c04478818461a9241dad2995ebefb9
    https://github.com/scummvm/scummvm/commit/f8fe150130c04478818461a9241dad2995ebefb9
Author: Alexander Tkachev (alexander at tkachov.ru)
Date: 2016-08-30T21:08:02+06:00

Commit Message:
CLOUD: Fix Webserver's usage of DefaultSaveFileManager

concatWithSavesPath() is only defined when curl is used, but was used in
Webserver even when curl is unavailable.

Changed paths:
    backends/networking/sdl_net/handlers/filesbasehandler.cpp
    backends/networking/sdl_net/handlerutils.cpp



diff --git a/backends/networking/sdl_net/handlers/filesbasehandler.cpp b/backends/networking/sdl_net/handlers/filesbasehandler.cpp
index 135e0fb..a585af9 100644
--- a/backends/networking/sdl_net/handlers/filesbasehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filesbasehandler.cpp
@@ -69,8 +69,12 @@ bool FilesBaseHandler::transformPath(Common::String &path, Common::String &prefi
 		prefixToAdd = "/saves/";
 
 		// determine savepath (prefix to remove)
+#ifdef USE_LIBCURL
 		DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager());
 		prefixToRemove = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath"));
+#else
+		prefixToRemove = ConfMan.get("savepath");
+#endif
 		if (prefixToRemove.size() && prefixToRemove.lastChar() != '/' && prefixToRemove.lastChar() != '\\')
 			prefixToRemove += '/';
 
diff --git a/backends/networking/sdl_net/handlerutils.cpp b/backends/networking/sdl_net/handlerutils.cpp
index dc21ab5..fba00ae 100644
--- a/backends/networking/sdl_net/handlerutils.cpp
+++ b/backends/networking/sdl_net/handlerutils.cpp
@@ -159,8 +159,12 @@ bool HandlerUtils::hasPermittedPrefix(const Common::String &path) {
 	}
 
 	// prefix for /saves/
+#ifdef USE_LIBCURL
 	DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager());
 	prefix = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath"));
+#else
+	prefix = ConfMan.get("savepath");
+#endif
 	return (normalized.hasPrefix(normalizePath(prefix)));
 }
 


Commit: 6b0766dc92337d3b95a7a349f204123213b4b733
    https://github.com/scummvm/scummvm/commit/6b0766dc92337d3b95a7a349f204123213b4b733
Author: Alexander Tkachev (alexander at tkachov.ru)
Date: 2016-08-30T21:08:06+06:00

Commit Message:
Merge branch 'master' of https://github.com/scummvm/scummvm

Changed paths:
    backends/platform/android/asset-archive.cpp
    backends/platform/android/asset-archive.h
    configure