From 7e8163c34ed46ab9c4b4b6cf8254846ab949af6e Mon Sep 17 00:00:00 2001 From: hunterk Date: Thu, 29 Dec 2016 10:29:59 -0600 Subject: [PATCH] =?UTF-8?q?Revert=20"(Android)=20reload=C2=A0cores=20path?= =?UTF-8?q?=20every=20lauch"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1841455462be12a7ed423f3b426333ce67852664. This commit was breaking Android builds on the buildbot. --- .../src/com/retroarch/browser/mainmenu/MainMenuActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java b/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java index be49e99010..b560a063f0 100644 --- a/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java +++ b/pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java @@ -5,6 +5,7 @@ import com.retroarch.browser.retroactivity.RetroActivityFuture; import com.retroarch.browser.retroactivity.RetroActivityPast; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.media.AudioManager; import android.os.Build; @@ -74,6 +75,7 @@ int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0; } UserPreferences.updateConfigFile(this); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); Intent retro; if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)) @@ -89,7 +91,7 @@ int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 0; startRetroActivity( retro, null, - (getApplicationInfo().dataDir + "/cores/"), + prefs.getString("libretro_path", getApplicationInfo().dataDir + "/cores/"), UserPreferences.getDefaultConfigPath(this), Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD), getApplicationInfo().dataDir,