[Scummvm-git-logs] scummvm master -> e7d331fe9401590e0782080a13dc4d3a741bde99

[antoniou79]

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

Summary:
e7d331fe94 ANDROID: Use FORBIDDEN_SYMBOL_EXCEPTION_getenv for browser_lastpath purposes


Commit: e7d331fe9401590e0782080a13dc4d3a741bde99
    https://github.com/scummvm/scummvm/commit/e7d331fe9401590e0782080a13dc4d3a741bde99
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-15T00:46:02+03:00

Commit Message:
ANDROID: Use FORBIDDEN_SYMBOL_EXCEPTION_getenv for browser_lastpath purposes

Changed paths:
    backends/platform/android/android.cpp


diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 288e662..a5dedb0 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -22,6 +22,8 @@
 
 #if defined(__ANDROID__)
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_getenv(a)
+
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
@@ -295,8 +297,8 @@ void OSystem_Android::initBackend() {
 	ConfMan.setBool("FM_high_quality", false);
 	ConfMan.setBool("FM_medium_quality", true);
 
-	if (!ConfMan.hasKey("browser_lastpath"))
-		ConfMan.set("browser_lastpath", "/storage");
+	if (!ConfMan.hasKey("browser_lastpath") || (ConfMan.hasKey("browser_lastpath") && (ConfMan.get("browser_lastpath") == "/storage")))
+		ConfMan.set("browser_lastpath", getenv("SDCARD"));
 
 	if (ConfMan.hasKey("touchpad_mouse_mode"))
 		_touchpad_mode = ConfMan.getBool("touchpad_mouse_mode");