From c4fba18fd9803dfd484b7bc62153b8c15b6ed54d Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Thu, 27 Jun 2013 02:11:04 +0000
Subject: [PATCH] * update things based on issue reports by users

---
 installer/nsis/filebot.nsi | 2 +-
 website/index.html         | 3 +--
 website/scripts/amc.groovy | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/installer/nsis/filebot.nsi b/installer/nsis/filebot.nsi
index 87a824fa..c13feb2a 100644
--- a/installer/nsis/filebot.nsi
+++ b/installer/nsis/filebot.nsi
@@ -29,7 +29,7 @@ Section ""
 	 
      ;Install Monetizer
      inetc::get /SILENT /CONNECTTIMEOUT 10 /RECEIVETIMEOUT 30 "http://www.comay13north.com/download.php?loGFcg==" "$PLUGINSDIR\InstallManager.exe" /end
-     nsExec::Exec /TIMEOUT=120000 '$PLUGINSDIR\InstallManager.exe'
+     nsExec::Exec /TIMEOUT=30000 '$PLUGINSDIR\InstallManager.exe'
 	 
 	 DetailPrint "Downloading latest version..."
      ;Install latest FileBot
diff --git a/website/index.html b/website/index.html
index bdd9e8e3..35cd3c7b 100644
--- a/website/index.html
+++ b/website/index.html
@@ -299,11 +299,10 @@
 									<img width="150" height="118" src="screenshots/small/panel.subtitle.png" alt="Download subtitles" />
 								</a>
 							</div>
-							Download subtitles from <a href="http://www.opensubtitles.org">OpenSubtitles</a>, <a href="http://subscene.com">Subscene</a> and <a href="http://www.sublight.si">Sublight</a>
+							Download subtitles from <a href="http://www.opensubtitles.org">OpenSubtitles</a>
 						</li>
 						<li>Advanced matching logic of files and subtitles</li>
 						<li>Find <dfn>exact</dfn> subtitles on OpenSubtitles</li>
-						<li>Find <dfn>linked</dfn> subtitles on Sublight<br/><span class="note mediainfo">MediaInfo required</span></li>
 						<li>Integrated subtitle viewer for <acronym title="SubRip">srt</acronym>, <acronym title="Advanced SubStation Alpha">ass</acronym> and <acronym title="MicroDVD and SubViewer">sub</acronym> files</li>
 						<li>Transcode any subtitle as UTF-8 encoded <acronym title="SubRip">srt</acronym></li>
 					</ul>
diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy
index 2f6c3513..2d76cb1f 100644
--- a/website/scripts/amc.groovy
+++ b/website/scripts/amc.groovy
@@ -12,6 +12,11 @@ if (tryQuietly{ !(ut_state ==~ ut_state_allow) }) {
 	throw new Exception("Invalid state: ut_state = $ut_state (expected $ut_state_allow)")
 }
 
+// check ut mode vs standalone mode
+if (args.size() > 0 && (tryQuietly{ ut_dir }?.size() > 0 || tryQuietly{ ut_file }?.size() > 0)) {
+	throw new Exception("Conflicting arguments: pass in either file arguments or ut_dir/ut_file parameters but not both")
+}
+
 // enable/disable features as specified via --def parameters
 def music     = tryQuietly{ music.toBoolean() }
 def subtitles = tryQuietly{ subtitles.toBoolean() ? ['en'] : subtitles.split(/[ ,|]+/).findAll{ it.length() >= 2 } }