Android: move stop to destroy to avoid early term
This commit is contained in:
parent
ac73de0dea
commit
7bc764be9b
|
@ -572,17 +572,18 @@ public class GL2JNIActivity extends Activity {
|
|||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
moga.onDestroy();
|
||||
if (serviceRunning(EmuService.class))
|
||||
stopService(serviceIntent);
|
||||
mView.onDestroy();
|
||||
JNIdc.stop();
|
||||
moga.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
// TODO Auto-generated method stub
|
||||
mView.onStop();
|
||||
super.onStop();
|
||||
// mView.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -573,14 +573,15 @@ public class GL2JNINative extends NativeActivity {
|
|||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
mView.onDestroy();
|
||||
JNIdc.stop();
|
||||
moga.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
JNIdc.stop();
|
||||
mView.onStop();
|
||||
super.onStop();
|
||||
// mView.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -76,16 +76,21 @@ public class EditVJoyActivity extends Activity {
|
|||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
mView.onStop();
|
||||
super.onStop();
|
||||
// mView.onStop();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
mView.onResume();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
mView.onDestroy();
|
||||
}
|
||||
|
||||
PopupWindow createVJoyPopup() {
|
||||
final PopupWindow popUp = new PopupWindow(this);
|
||||
|
|
|
@ -693,7 +693,18 @@ public class GL2JNIView extends GLSurfaceView
|
|||
|
||||
}
|
||||
|
||||
public void onStop() {
|
||||
// public void onStop() {
|
||||
// // TODO Auto-generated method stub
|
||||
// System.exit(0);
|
||||
// try {
|
||||
// ethd.join();
|
||||
// } catch (InterruptedException e) {
|
||||
// // TODO Auto-generated catch block
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
|
||||
public void onDestroy() {
|
||||
// TODO Auto-generated method stub
|
||||
System.exit(0);
|
||||
try {
|
||||
|
|
Loading…
Reference in New Issue