From 39457725f6f23577705f27f2a6c2faee7cec8cf5 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 29 Aug 2011 18:17:57 +0300 Subject: [PATCH] Small fix to suspend/resume --- project/java/Video.java | 6 ++++-- project/jni/application/src | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/project/java/Video.java b/project/java/Video.java index 9f769fc2d..3217e52ac 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -502,7 +502,8 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { @Override public void onPause() { - mRenderer.accelerometer.stop(); + if( mRenderer.accelerometer != null ) // For some reason it crashes here often - are we getting this event before initialization? + mRenderer.accelerometer.stop(); super.onPause(); mRenderer.mPaused = true; }; @@ -518,7 +519,8 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { System.out.println("libSDL: DemoGLSurfaceView.onResume(): mRenderer.mGlSurfaceCreated " + mRenderer.mGlSurfaceCreated + " mRenderer.mPaused " + mRenderer.mPaused); if( mRenderer.mGlSurfaceCreated && ! mRenderer.mPaused || Globals.NonBlockingSwapBuffers ) mRenderer.nativeGlContextRecreated(); - mRenderer.accelerometer.start(); + if( mRenderer.accelerometer != null ) // For some reason it crashes here often - are we getting this event before initialization? + mRenderer.accelerometer.start(); }; // This seems like redundant code - it handled in MainActivity.java diff --git a/project/jni/application/src b/project/jni/application/src index 59d41f41e..4a9a58e93 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -fheroes2 \ No newline at end of file +puae \ No newline at end of file