* some minor adjustments

build.xml

@@ -21,6 +21,14 @@
 
 		<!-- main jar -->
 		<jar destfile="${dir.dist}/filebot.jar">
+			<manifest>
+				<attribute name="Built-By" value="${user.name}" />
+				<attribute name="Built-Date" value="${today}" />
+				<attribute name="Application-Name" value="${title}" />
+				<attribute name="Application-Version" value="${version}" />
+				<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
+			</manifest>
+					
 			<fileset dir="${dir.build}" excludes="**/*Test*" />
 		</jar>
 
@@ -36,17 +44,9 @@
 		<mkdir dir="${dir.dist}/fatjar" />
 
 		<jar destfile="${dir.dist}/fatjar/FileBot.jar" filesetmanifest="merge" duplicate="fail">
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${today}" />
-				<attribute name="Application-Name" value="${title}" />
-				<attribute name="Application-Version" value="${version}" />
-				<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
-			</manifest>
-
-			<!-- include build -->
-			<fileset dir="${dir.build}" excludes="**/*Test*" />
-
+			<!-- include main jar -->
+			<zipfileset src="${dir.dist}/filebot.jar" />
+			
 			<!-- include libs -->
 			<zipfileset src="${dir.lib}/xercesImpl.jar">
 				<include name="org/apache/**" />
@@ -126,7 +126,7 @@
 
 		<!-- create native lib jars -->
 		<antcall target="webstart-nativelib">
-			<param name="arch" value="win32-x86" />
+			<param name="arch" value="win32-x86" />
 		</antcall>
 		<antcall target="webstart-nativelib">
 			<param name="arch" value="win32-amd64" />

source/net/sourceforge/filebot/ui/panel/rename/EpisodeBindingDialog.java

@@ -290,15 +290,15 @@ class EpisodeBindingDialog extends JDialog {
 				File selectedFile = chooser.getSelectedFile();
 				
 				if (selectedFile.isFile()) {
-					// update text field
-					mediaFileTextField.setText(selectedFile.getAbsolutePath());
-					
-					// display media info
 					try {
+						// display media info
 						MediaInfoPane.showMessageDialog(getWindow(evt.getSource()), selectedFile);
 					} catch (LinkageError e) {
 						Logger.getLogger("ui").log(Level.SEVERE, "Unable to load native library 'mediainfo'", e);
 					}
+					
+					// update text field
+					mediaFileTextField.setText(selectedFile.getAbsolutePath());
 				}
 			}
 		}

source/net/sourceforge/filebot/ui/panel/rename/EpisodeBindingDialog.properties

@@ -22,8 +22,8 @@ expr[c4]: crc32
 
 # media info expressions [media]
 expr[d1]: media.title
-expr[d2]: media.Duration_String
-expr[d3]: media.OverallBitRate_String
+expr[d2]: media.DurationString
+expr[d3]: media.OverallBitRateString
 
 # media info expressions [video]
 expr[e1]: video.Codec
@@ -35,15 +35,9 @@ expr[e5]: video.InterlacementString
 # media info expressions [audio]
 expr[f1]: audio.Codec
 expr[f2]: audio.Channels
-expr[f3]: audio.BitRate_String
+expr[f3]: audio.BitRateString
 expr[f4]: audio.Language
 
 # media info expressions [text]
 expr[g1]: text.CodecInfo
 expr[g2]: text.Language
-
-# fundamental media info expressions
-expr[h1]: media
-expr[h2]: video
-expr[h3]: audio
-expr[h4]: text