Commit 1745116fe8915d0d72750c3cd1b934e85a15be64

Philipp Wiesemann 2014-10-24T11:53:34

Fixed bug 2759 - Android findLibrary() returns NULL Sylvain extra patch with minor modifications: - typo - cancel-able set to false - add the error message, so that the user can report it.

diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index 58a360d..cb8ef07 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -119,20 +119,26 @@ public class SDLActivity extends Activity {
         mSingleton = this;
 
         // Load shared libraries
+        String errorMsgBrokenLib = "";
         try {
             loadLibraries();
         } catch(UnsatisfiedLinkError e) {
             System.err.println(e.getMessage());
             mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
         } catch(Exception e) {
             System.err.println(e.getMessage());
             mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
         }
 
         if (mBrokenLibraries)
         {
             AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
-            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall.");
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
             dlgAlert.setTitle("SDL Error");
             dlgAlert.setPositiveButton("Exit",
                 new DialogInterface.OnClickListener() {