mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 02:29:51 +01:00
New Atlas
Merge branch 'master' into TemporaryHackishBranch # Conflicts: # UI/MainScreen.cpp # android/assets/ui_atlas.zim # android/assets/ui_atlas_luna.meta # assets/ui_atlas.zim # assets/ui_atlas_luna.meta
This commit is contained in:
commit
4b6855cd6e
134 files changed
+2120
-499
No files matched your search
@@ -420,6 +420,8 @@ void EmuScreen::sendMessage(const char *message, const char *value) {
|
||||
PSP_Shutdown();
|
||||
bootPending_ = true;
|
||||
gamePath_ = value;
|
||||
// Don't leave it on CORE_POWERDOWN, we'll sometimes aggressively bail.
|
||||
Core_UpdateState(CORE_POWERUP);
|
||||
}
|
||||
} else if (!strcmp(message, "config_loaded")) {
|
||||
// In case we need to position touch controls differently.
|
||||
|
||||
Reference in new issue
Block a user