X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fsrc%2Forg%2Fd2df%2Fapp%2FDoom2DF.java;h=05a1f4ab0f6b1943dfd9a3ab7cb594cf59d1c283;hb=9c9634684cd637c149d010e1a941d07547fa8eca;hp=07e63eeb8743f971221a2f252c3a1550cd79e533;hpb=5bf9c81ca00b024398c0da073fca7d16339a6eaf;p=d2df-sdl.git

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index 07e63ee..05a1f4a 100644
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -11,11 +11,11 @@ public class Doom2DF extends SDLActivity {
 	@Override
 	protected String[] getLibraries() {
 		return new String[] {
+			"crystax",
 			"SDL2",
 			"mpg123",
 			"SDL2_mixer",
 			"enet",
-			"nanoGL",
 			"Doom2DF"
 		};
 	}
@@ -23,6 +23,7 @@ public class Doom2DF extends SDLActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+
 		CopyAssets.copyAssets(SDL.getContext(), "");
 		CopyAssets.copyAssets(SDL.getContext(), "data");
 		CopyAssets.copyAssets(SDL.getContext(), "data/models");
@@ -32,4 +33,12 @@ public class Doom2DF extends SDLActivity {
 		CopyAssets.copyAssets(SDL.getContext(), "instruments");
 		CopyAssets.copyAssets(SDL.getContext(), "timidity.cfg");
 	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+
+		/* This will fix bug #31 and may be #32 */
+		System.exit(0);
+	}
 }