X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fsrc%2Forg%2Fd2df%2Fapp%2FDoom2DF.java;h=fe9bc1531694ead501903c37ab48d8deb15a1136;hb=15583dd918333276650cbcc705d44dcb55f10199;hp=ca1766609ac4b4a689bca384dba7db7d0a530ff8;hpb=defbc8a87bbfc67290bdbe413be9b58c27f20b53;p=d2df-sdl.git

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index ca17666..fe9bc15 100644
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -15,7 +15,6 @@ public class Doom2DF extends SDLActivity {
 			"mpg123",
 			"SDL2_mixer",
 			"enet",
-			"nanoGL",
 			"Doom2DF"
 		};
 	}
@@ -23,11 +22,22 @@ 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");
 		CopyAssets.copyAssets(SDL.getContext(), "maps");
 		CopyAssets.copyAssets(SDL.getContext(), "maps/megawads");
 		CopyAssets.copyAssets(SDL.getContext(), "wads");
+		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);
 	}
 }