[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello] umbrello: Fixup of 75da50385
From:       Ralf Habacker <null () kde ! org>
Date:       2017-10-31 21:30:58
Message-ID: E1e9e7e-0004kT-7R () code ! kde ! org
[Download RAW message or body]

Git commit 17d4afa70c8d0e97d15997885d81b051744862d8 by Ralf Habacker.
Committed on 31/10/2017 at 21:30.
Pushed by habacker into branch 'master'.

Fixup of 75da50385

Adding "<xxx>" to the first parameter of an option requires to call
getOption() to get the option value.

M  +2    -2    umbrello/main.cpp

https://commits.kde.org/umbrello/17d4afa70c8d0e97d15997885d81b051744862d8

diff --git a/umbrello/main.cpp b/umbrello/main.cpp
index d390c1a85..6ae99cbe9 100644
--- a/umbrello/main.cpp
+++ b/umbrello/main.cpp
@@ -249,12 +249,12 @@ int main(int argc, char *argv[])
                 uml->setActiveLanguage(lang);
             uml->importFiles(importList);
         }
-        else if (args->isSet("import-directory") && args->count() > 0) {
+        else if (args->isSet("import-directory")) {
             uml->newDocument();
             if (lang != Uml::ProgrammingLanguage::Reserved)
                 uml->setActiveLanguage(lang);
             QStringList filter = Uml::ProgrammingLanguage::toExtensions(uml->activeLanguage());
-            QString dir = args->url(0).toLocalFile();
+            QString dir = args->getOption("import-directory");
             QStringList listFile;
             getFiles(listFile, dir, filter);
             uml->importFiles(listFile, dir);
[prev in list] [next in list] [prev in thread] [next in thread]