From 6a44c4eea23237475bd00c297d77a9dc75668426 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Wed, 29 Jun 2016 12:52:18 +0800
Subject: [PATCH] Improved error messages when running 64-bit FileBot with
 32-bit Java on a 64-bit OS

---
 .classpath                                           | 2 +-
 source/net/filebot/mediainfo/MediaInfoException.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index 0804f432..f46e2a7f 100644
--- a/.classpath
+++ b/.classpath
@@ -10,7 +10,7 @@
 	<classpathentry kind="lib" path="lib/ivy/jar/ehcache.jar" sourcepath="lib/ivy/source/ehcache.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/glazedlists_java15.jar" sourcepath="lib/ivy/source/glazedlists_java15.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/icu4j.jar"/>
-	<classpathentry kind="lib" path="lib/ivy/jar/jna.jar"/>
+	<classpathentry kind="lib" path="lib/ivy/jar/jna.jar" sourcepath="lib/ivy/source/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/junit.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/miglayout-core.jar"/>
 	<classpathentry kind="lib" path="lib/ivy/jar/miglayout-swing.jar"/>
diff --git a/source/net/filebot/mediainfo/MediaInfoException.java b/source/net/filebot/mediainfo/MediaInfoException.java
index 8c0992a1..62ba4132 100644
--- a/source/net/filebot/mediainfo/MediaInfoException.java
+++ b/source/net/filebot/mediainfo/MediaInfoException.java
@@ -15,7 +15,8 @@ public class MediaInfoException extends RuntimeException {
 	private static String getLinkageErrorMessage(LinkageError e) {
 		String name = Platform.isWindows() ? "MediaInfo.dll" : Platform.isMac() ? "libmediainfo.dylib" : "libmediainfo.so";
 		String arch = System.getProperty("os.arch");
-		return String.format("Unable to load %s native library %s: %s", arch, name, e.getMessage());
+		String bit = Platform.is64Bit() ? "64-bit" : "32-bit";
+		return String.format("Unable to load %s (%s) native library %s: %s", arch, bit, name, e.getMessage());
 	}
 
 }