# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1407245672 -7200
# Node ID 8dc9b2cd20d4274501aad93e33effba0f2823c92
# Parent  478bc3f42a4eb0b62caa67c20856923d15bb3b02# Parent  3f23130b16b23907dfdfc9b439c40e778f7ed996
merge

diff -r 3f23130b16b2 -r 8dc9b2cd20d4 .hgsubstate
--- a/.hgsubstate	Tue Aug 05 12:24:08 2014 +0200
+++ b/.hgsubstate	Tue Aug 05 15:34:32 2014 +0200
@@ -1,1 +1,1 @@
-1e5118fa0cb1e483c7f696a774da944c10b3b00a nss-cmake-static
+a945361df361ebd06a9c2663685fe1d6e485b13e nss-cmake-static
diff -r 3f23130b16b2 -r 8dc9b2cd20d4 ui/createinstallerdialog.cpp
--- a/ui/createinstallerdialog.cpp	Tue Aug 05 12:24:08 2014 +0200
+++ b/ui/createinstallerdialog.cpp	Tue Aug 05 15:34:32 2014 +0200
@@ -293,6 +293,7 @@
         }
         arguments << QString::fromLatin1("/D%1=%2").arg(key, value);
     }
+    arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\");
 #else
     arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path();
     arguments << "-Dpath_sep=/";
@@ -304,9 +305,14 @@
         }
         arguments << QString::fromLatin1("-D%1=%2").arg(key, value);
     }
+    arguments << binDir.path() + "/trustbridge.nsi";
 #endif
 
-    arguments << binDir.path() + "/trustbridge.nsi";
+
+    QFileInfo nsiFile (binDir.path() + "/trustbridge.nsi");
+    if (!nsiFile.exists()) {
+        showErrorMessage(tr("Failed to find installer script at: %1 ").arg(nsiFile.filePath()));
+    }
 
     qDebug() << "Starting makensis with arguments: " << arguments;
     mNSISProc.setArguments(arguments);