libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-11 03:36:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Exit cleanly on Android instead of hard-exiting using exit(0).

Browse Source
This commit is contained in:
Henrik Rydgard 2016-02-13 19:57:05 +01:00
parent e1ebc12d7f
commit bfa5091c41
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/MainScreen.cpp
View File

@ -1119,12 +1119,10 @@ UI::EventReturn MainScreen::OnExit(UI::EventParams &e) {
// However, let's make sure the config was saved, since it may not have been.
g_Config.Save();
// We shouldn't call NativeShutdown here at all, it should be done by the framework.
#ifdef ANDROID
#ifdef ANDROID_NDK_PROFILER
moncleanup();
#endif
exit(0);
#endif
UpdateUIState(UISTATE_EXIT);
@ -1144,7 +1142,7 @@ void MainScreen::dialogFinished(const Screen *dialog, DialogResult result) {
// Refocus the game button itself.
int tab = tabHolder_->GetCurrentTab();
if (tab >= 0 && tab < gameBrowsers_.size()) {
if (tab >= 0 && tab < (int)gameBrowsers_.size()) {
gameBrowsers_[tab]->FocusGame(restoreFocusGamePath_);
}

7
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -77,6 +77,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
private Vibrator vibrator;
private boolean isXperiaPlay;
private boolean shuttingDown;
// Allow for multiple connected gamepads but just consider them the same for now.
// Actually this is not entirely true, see the code.
@ -362,6 +363,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
shuttingDown = false;
registerCallbacks();
updateDisplayMetrics(null);
@ -477,6 +479,10 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
audioFocusChangeListener = null;
audioManager = null;
unregisterCallbacks();
if (shuttingDown) {
NativeApp.shutdown();
}
}
@Override
@ -951,6 +957,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
}
return true;
} else if (command.equals("finish")) {
shuttingDown = true;
finish();
} else if (command.equals("rotate")) {
updateScreenRotation();