FIX: [droid] fix crash when restarted by system

2 files changed, 10 insertions, 10 deletions

diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
index 0c35d43285..3ea0399452 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in
@@ -25,6 +25,16 @@ public class Main extends NativeActivity
   @Override
   public void onCreate(Bundle savedInstanceState) 
   {
+    // The dynamic linker on droid is a mess.
+    // Depending on version, it might not be able to properly resolve
+    try
+    {
+      // Surround with try-catch to allow static version (3.0)
+      System.loadLibrary("smbclient");
+    }
+    catch (UnsatisfiedLinkError e) {}
+    System.loadLibrary("@APP_NAME_LC@");
+
     super.onCreate(savedInstanceState);
     setVolumeControlStream(AudioManager.STREAM_MUSIC);
       
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in
index 81741ebee5..ab7819de6d 100644
--- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in
+++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in
@@ -556,16 +556,6 @@ public class Splash extends Activity {
   }
 
   protected void startXBMC() {
-    // The dynamic linker on droid is a mess.
-    // Depending on version, it might not be able to properly resolve
-    try
-    {
-      // Surround with try-catch to allow static version (3.0)
-      System.loadLibrary("smbclient");
-    }
-    catch (UnsatisfiedLinkError e) {}
-    System.loadLibrary("@APP_NAME_LC@");
-    
     // Run @APP_NAME@
     Intent intent = getIntent();
     intent.setClass(this, org.xbmc.@APP_NAME_LC@.Main.class);