From b3ff2e3c5cf0595c8b87f2e257c3edd377a74dfe Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Mon, 11 Dec 2017 20:29:51 +0100 Subject: [PATCH] ui: Fixed location pickers used root directory when empty --- src/lib_gui/qt/element/QtDirectoryListBox.cpp | 2 +- src/lib_gui/qt/element/QtLocationPicker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_gui/qt/element/QtDirectoryListBox.cpp b/src/lib_gui/qt/element/QtDirectoryListBox.cpp index 76d5b11c..25dbf610 100644 --- a/src/lib_gui/qt/element/QtDirectoryListBox.cpp +++ b/src/lib_gui/qt/element/QtDirectoryListBox.cpp @@ -78,7 +78,7 @@ void QtListItemWidget::handleButtonPress() { FilePath path(m_data->text().toStdString()); FilePath relativeRoot = m_list->getRelativeRootDirectory(); - if (!relativeRoot.empty()) + if (!path.empty() && !path.isAbsolute() && !relativeRoot.empty()) { path = relativeRoot.concat(path); } diff --git a/src/lib_gui/qt/element/QtLocationPicker.cpp b/src/lib_gui/qt/element/QtLocationPicker.cpp index dbfb74a5..dc5c3010 100644 --- a/src/lib_gui/qt/element/QtLocationPicker.cpp +++ b/src/lib_gui/qt/element/QtLocationPicker.cpp @@ -100,7 +100,7 @@ void QtLocationPicker::changeEvent(QEvent *event) void QtLocationPicker::handleButtonPress() { FilePath path(m_data->text().toStdString()); - if (!m_relativeRootDirectory.empty()) + if (!path.empty() && !path.isAbsolute() && !m_relativeRootDirectory.empty()) { path = m_relativeRootDirectory.concat(path); }