diff --git a/src/app/main.cpp b/src/app/main.cpp index 5b490ce0..88d24340 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -51,6 +51,10 @@ void prefillJavaRuntimePath() settings->setJavaPath(paths.front().str()); settings->save(); } + else + { + std::cout << "no javapath" << std::endl; + } } } @@ -136,6 +140,7 @@ int main(int argc, char *argv[]) if (!checker->isCurrentLicenseValid()) // this works because the user cannot enter a license string while running the app in headless more. { + std::cout << "No or invalide License" << std::endl; LOG_WARNING("Your current Coati license seems to be invalid. Please update your license info."); return 0; } diff --git a/src/lib/utility/commandline/CommandLineParser.cpp b/src/lib/utility/commandline/CommandLineParser.cpp index a669382d..09ed2514 100644 --- a/src/lib/utility/commandline/CommandLineParser.cpp +++ b/src/lib/utility/commandline/CommandLineParser.cpp @@ -166,7 +166,7 @@ void CommandLineParser::processProjectfile(const std::string& file) if (isValidProjectfile) { - m_projectFile = projectfile.absolute().str(); + m_projectFile = projectfile; } else { @@ -176,11 +176,10 @@ void CommandLineParser::processProjectfile(const std::string& file) void CommandLineParser::projectLoad() { - FilePath path(m_projectFile); // todo: use filepath as datatype for m_projectFile - if (path.exists() && path.extension() == ".coatiproject") + if (m_projectFile.exists() && m_projectFile.extension() == ".coatiproject") { MessageDispatchWhenLicenseValid( - std::make_shared(path.str(), m_force) + std::make_shared(m_projectFile.str(), m_force) ).dispatch(); } } diff --git a/src/lib/utility/commandline/CommandLineParser.h b/src/lib/utility/commandline/CommandLineParser.h index 27e2b5a6..b1a019b2 100644 --- a/src/lib/utility/commandline/CommandLineParser.h +++ b/src/lib/utility/commandline/CommandLineParser.h @@ -4,6 +4,7 @@ #include #include "Application.h" #include "License.h" +#include "utility/file/FilePath.h" class CommandLineParser { @@ -19,7 +20,7 @@ public: private: void processProjectfile(const std::string& file); void processLicense(const bool isLoaded); - std::string m_projectFile; + FilePath m_projectFile; bool m_force; bool m_quit; diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp index 41e5e390..81c5f1a1 100644 --- a/src/lib_gui/qt/view/QtErrorView.cpp +++ b/src/lib_gui/qt/view/QtErrorView.cpp @@ -252,7 +252,7 @@ bool QtErrorView::isShownError(const StorageError& error) { return true; } - if (error.fatal && !error.indexed && m_showNonIndexedErrors->checkState() == Qt::Checked) + if (!error.fatal && !error.indexed && m_showNonIndexedErrors->checkState() == Qt::Checked) { return true; }