Fix 207cfebb778b.

Obviously there was a problem with the indexOf call. Also once we
omit the -i, the input could be -o or even worse the output path.

Change-Id: I60a970c7e2857195e214cf2441d87468d297a7c2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 19cb18140..b37e9fd8e 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
             }
 
             // output path
-            const QString output = args.value(args.indexOf(QLatin1String("-o") + 1));
+            const QString output = args.at(args.indexOf(QLatin1String("-o")) + 1);
             if (output.isEmpty()) {
                 InstallerBase::showUsage();
                 return EXIT_FAILURE;
@@ -209,8 +209,11 @@ int main(int argc, char *argv[])
             MyCoreApplication app(argc, argv);
 
             // input, if not given use current app
-            QString input = args.value(args.indexOf(QLatin1String("-i") + 1));
-            if (input.isEmpty())
+            QString input;
+            if (args.indexOf(QLatin1String("-i")) >= 0)
+                input = args.value(args.indexOf(QLatin1String("-i")) + 1);
+
+            if (input.isEmpty() || input == QLatin1String("-o") || input == output)
                  input = QCoreApplication::applicationFilePath();
 
             OperationRunner o(input);