diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp index 35be2731..5bc25906 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp @@ -279,7 +279,7 @@ void QtProjectWizzardContentCodeblocksProjectPath::load() m_picker->setText(QString::fromStdWString(m_settings->getCodeblocksProjectPath().wstr())); m_filePaths = utility::getAsRelativeIfShorter( - utility::toVector(SourceGroupCxxCodeblocks(m_settings).getAllSourceFilePaths()), + utility::toVector(SourceGroupCxxCodeblocks(m_settings).getAllSourceFilePaths()), m_settings->getProjectDirectoryPath() ); @@ -294,11 +294,6 @@ void QtProjectWizzardContentCodeblocksProjectPath::save() m_settings->setCodeblocksProjectPath(FilePath(m_picker->getText().toStdWString())); } -bool QtProjectWizzardContentCodeblocksProjectPath::check() -{ - return true; -} - std::vector QtProjectWizzardContentCodeblocksProjectPath::getFilePaths() const { const_cast(this)->load(); @@ -342,7 +337,7 @@ std::shared_ptr QtProjectWizzardContentCodeblocksProjectPat QtProjectWizzardContentSonargraphProjectPath::QtProjectWizzardContentSonargraphProjectPath( - std::shared_ptr settings, + std::shared_ptr settings, std::shared_ptr settingsCxxSonargraph, std::shared_ptr settingsWithSonargraphProjectPath, QtProjectWizzardWindow* window @@ -422,6 +417,11 @@ void QtProjectWizzardContentSonargraphProjectPath::save() bool QtProjectWizzardContentSonargraphProjectPath::check() { + if (!QtProjectWizzardContentPath::check()) + { + return false; + } + if (std::shared_ptr sonargraphProject = Sonargraph::Project::load( m_settingsWithSonargraphProjectPath->getSonargraphProjectPathExpandedAndAbsolute(), m_settings->getLanguage() )) @@ -572,7 +572,7 @@ std::vector QtProjectWizzardContentPathSourceMaven::getFilePaths() con utility::toVector(SourceGroupJavaMaven(m_settings).getAllSourceFilePaths()), m_settings->getProjectDirectoryPath() ); -} +} std::shared_ptr QtProjectWizzardContentPathSourceMaven::getSourceGroupSettings() { diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h index d5972209..489f39aa 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h @@ -95,7 +95,6 @@ public: void load() override; void save() override; - bool check() override; std::vector getFilePaths() const override; QString getFileNamesTitle() const override;