Fix crash when no texture selected for a texture sampler

Task-number: QT3DS-2748
Change-Id: Ida98b12bac43be0e85b0e99fb5ee797049768a4e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp b/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
index 54ff310b..32ba2bdb 100644
--- a/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/TextureChooserView.cpp
@@ -90,18 +90,21 @@ int TextureChooserView::instance() const
 
 QString TextureChooserView::currentDataModelPath() const
 {
+    QString cleanPath;
     const auto doc = g_StudioApp.GetCore()->GetDoc();
     const auto propertySystem = doc->GetStudioSystem()->GetPropertySystem();
 
     qt3dsdm::SValue value;
     propertySystem->GetInstancePropertyValue(m_instance, m_handle, value);
 
-    QString cleanPath = qt3dsdm::get<QString>(value);
-    if (cleanPath.isEmpty() || cleanPath == QLatin1String("./")) {
+    const QString currentValue = qt3dsdm::get<QString>(value);
+    // An empty value can sometimes be represented by a relative path either to project root or the
+    // presentation file, such as"./" or "../", so let's just consider all directory paths as empty
+    if (currentValue.isEmpty() || QFileInfo(currentValue).isDir()) {
         cleanPath = ChooserModelBase::noneString();
     } else {
         cleanPath = QDir::cleanPath(QDir(doc->GetDocumentDirectory().toQString())
-                                    .filePath(cleanPath));
+                                    .filePath(currentValue));
     }
     return cleanPath;
 }