diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java index ca7175e9f..9a0f1fb97 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java @@ -141,6 +141,12 @@ public class Game implements ApplicationListener { @Override public void render() { + //prevents weird rare cases where the app is running twice + if (instance != this){ + finish(); + return; + } + NoosaScript.get().resetCamera(); NoosaScriptNoLighting.get().resetCamera(); Gdx.gl.glDisable(Gdx.gl.GL_SCISSOR_TEST); diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 66d3b53ce..1b84111b4 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -40,7 +40,7 @@ android:label="${appName}" android:name=".AndroidGame" android:screenOrientation="nosensor" - android:configChanges="keyboard|keyboardHidden|orientation"> + android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize"> diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java index 5ecc3b561..8110b3d09 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java @@ -124,17 +124,6 @@ public class AndroidGame extends AndroidApplication { super.onResume(); } - @Override - protected void onDestroy() { - //LibGDX itself doesn't clear these in every case, so we do it ourselves to be sure - graphics.clearManagedCaches(); - audio.dispose(); - if (instance == this) { - instance = null; - } - super.onDestroy(); - } - @Override public void onBackPressed() { //do nothing, game should catch all back presses