Merge pull request #1268 from reicast/lk/android-studio

Android: restore hard exiting thread (w/ notes)
This commit is contained in:
Out of Office 2018-08-08 12:19:16 -04:00 committed by GitHub
commit ce7ebdc730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions

View File

@ -586,11 +586,6 @@ public class GL2JNINative extends NativeActivity {
moga.onDestroy();
}
@Override
protected void onStop() {
super.onStop();
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);

View File

@ -681,6 +681,8 @@ public class GL2JNIView extends GLSurfaceView
}
public void onDestroy() {
// Workaround for ANR when returning to menu
System.exit(0);
try {
ethd.join();
} catch (InterruptedException e) {