Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12689 from unknownbrackets/android-shortcut

Browse source 
Fix game settings behavior on Android shortcut
This commit is contained in:
Henrik Rydgård 2020-03-09 00:20:33 +01:00 • committed by GitHub
commit a953257018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Core/Config.cpp
View file

@ -1114,6 +1114,12 @@ std::map<std::string, std::pair<std::string, int>> GetLangValuesMapping() {
return langValuesMapping;
}
void Config::Reload() {
reload_ = true;
Load();
reload_ = false;
}
void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
const bool useIniFilename = iniFileName != nullptr && strlen(iniFileName) > 0;
iniFilename_ = FindConfigFile(useIniFilename ? iniFileName : "ppsspp.ini");
@ -1489,7 +1495,8 @@ bool Config::hasGameConfig(const std::string &pGameId) {
}
void Config::changeGameSpecific(const std::string &pGameId, const std::string &title) {
Save("changeGameSpecific");
if (!reload_)
Save("changeGameSpecific");
gameId_ = pGameId;
gameIdTitle_ = title;
bGameSpecific = !pGameId.empty();
@ -1568,7 +1575,7 @@ bool Config::loadGameConfig(const std::string &pGameId, const std::string &title
}
void Config::unloadGameConfig() {
if (bGameSpecific){
if (bGameSpecific) {
changeGameSpecific();
IniFile iniFile;

2
Core/Config.h
View file

@ -452,6 +452,7 @@ public:
void Load(const char *iniFileName = nullptr, const char *controllerIniFilename = nullptr);
void Save(const char *saveReason);
void Reload();
void RestoreDefaults();
//per game config managment, should maybe be in it's own class
@ -490,6 +491,7 @@ protected:
void LoadStandardControllerIni();
private:
bool reload_ = false;
std::string gameId_;
std::string gameIdTitle_;
std::string iniFilename_;

1
Core/HLE/sceIo.cpp
View file

@ -2732,6 +2732,7 @@ static int IoAsyncFinish(int id) {
default:
ERROR_LOG_REPORT(SCEIO, "Unknown async op %d", params.op);
us = 0;
break;
}

3
UI/NativeApp.cpp
View file

@ -538,6 +538,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
const char *stateToLoad = 0;
bool gotBootFilename = false;
boot_filename = "";
// Parse command line
LogTypes::LOG_LEVELS logLevel = LogTypes::LINFO;
@ -1173,7 +1174,7 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
// and I can't risk it before 1.9.0.
int gpuBackend = g_Config.iGPUBackend;
ILOG("Reloading config after storage permission grant.");
g_Config.Load();
g_Config.Reload();
PostLoadConfig();
g_Config.iGPUBackend = gpuBackend;
}

1
android/src/org/ppsspp/ppsspp/PpssppActivity.java
View file

@ -88,6 +88,7 @@ public class PpssppActivity extends NativeActivity {
super.setShortcutParam(getIntent().getStringExtra(SHORTCUT_EXTRA_KEY));
} else {
Log.e(TAG, "Shortcut missing parameter!");
super.setShortcutParam("");
}
}
super.onCreate(savedInstanceState);