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 @@
- Download subtitles from OpenSubtitles, Subscene and Sublight
+ Download subtitles from OpenSubtitles
Advanced matching logic of files and subtitles
Find exact subtitles on OpenSubtitles
- Find linked subtitles on Sublight
MediaInfo required
Integrated subtitle viewer for srt, ass and sub files
Transcode any subtitle as UTF-8 encoded srt
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 } }