Editor: Rename of asset can lead to crash #1277

engine/src/editor/baseassetprovider.cpp

@@ -95,9 +95,11 @@ void BaseAssetProvider::onDirectoryChangedForce(const QString &path, bool force)
 }
 
 void BaseAssetProvider::removeResource(const TString &source) {
-    AssetManager *asset = AssetManager::instance();
-    ProjectSettings *project = ProjectSettings::instance();
+    if(source.isEmpty()) {
+        return;
+    }
 
+    ProjectSettings *project = ProjectSettings::instance();
     TString src(project->contentPath() + "/" + source);
     if(File::isDir(src)) {
         m_dirWatcher->removePath(src.data());
@@ -109,30 +111,31 @@ void BaseAssetProvider::removeResource(const TString &source) {
         }
         QDir().rmdir(src.data());
         return;
-    } else {
-        CodeBuilder *builder = nullptr;
-        BuilderSettings *settings = dynamic_cast<BuilderSettings *>(asset->fetchSettings(src));
-        if(settings) {
-            builder = settings->builder();
-        }
-        m_fileWatcher->removePath(src.data());
-        Engine::unloadResource(source);
+    }
 
-        TString uuid = asset->unregisterAsset(source);
-        if(!uuid.isEmpty()) {
-            File::remove(project->importPath() + "/" + uuid);
-            File::remove(project->iconPath() + "/" + uuid + ".png");
-        }
+    AssetManager *asset = AssetManager::instance();
+    CodeBuilder *builder = nullptr;
+    BuilderSettings *settings = dynamic_cast<BuilderSettings *>(asset->fetchSettings(src));
+    if(settings) {
+        builder = settings->builder();
+    }
+    m_fileWatcher->removePath(src.data());
+    Engine::unloadResource(source);
 
-        File::remove(src + "." + gMetaExt);
-        File::remove(src);
+    TString uuid = asset->unregisterAsset(source);
+    if(!uuid.isEmpty()) {
+        File::remove(project->importPath() + "/" + uuid);
+        File::remove(project->iconPath() + "/" + uuid + ".png");
+    }
 
-        if(builder) {
-            builder->rescanSources(project->contentPath());
-            if(!builder->isEmpty()) {
-                builder->makeOutdated();
-                builder->buildProject();
-            }
+    File::remove(src + "." + gMetaExt);
+    File::remove(src);
+
+    if(builder) {
+        builder->rescanSources(project->contentPath());
+        if(!builder->isEmpty()) {
+            builder->makeOutdated();
+            builder->buildProject();
         }
     }
 

worldeditor/src/screens/baseobjectmodel/baseobjectmodel.cpp

@@ -7,72 +7,101 @@ BaseObjectModel::BaseObjectModel(QObject *parent) :
 }
 
 QObject *BaseObjectModel::createRoot() {
-    return new QObject(this);
+    QObject *root = new QObject(this);
+    addItem(root);
+    return root;
 }
 
 int BaseObjectModel::rowCount(const QModelIndex &parent) const {
     QObject *parentItem = m_rootItem;
     if(parent.isValid()) {
-        parentItem = static_cast<QObject *>(parent.internalPointer());
+        parentItem = getObject(parent);
     }
-    return parentItem->children().size();
+    if(parentItem) {
+        return parentItem->children().size();
+    }
+    return 0;
 }
 
 QModelIndex BaseObjectModel::index(int row, int column, const QModelIndex &parent) const {
     QObject *parentItem = m_rootItem;
     if(parent.isValid()) {
-        parentItem = static_cast<QObject *>(parent.internalPointer());
+        parentItem = getObject(parent);
     }
-    if(row >= parentItem->children().size() || row < 0) {
+    if(!parentItem || row >= parentItem->children().size() || row < 0) {
         return QModelIndex();
     }
-    return createIndex(row, column, parentItem->children().at(row));
+
+    QObject *item = parentItem->children().at(row);
+    return createIndex(row, column, reinterpret_cast<quintptr>(item));
 }
 
 QModelIndex BaseObjectModel::parent(const QModelIndex &index) const {
     if(!index.isValid()) {
         return QModelIndex();
     }
 
-    QObject *childItem = static_cast<QObject *>(index.internalPointer());
-    QObject *parentItem = childItem->parent();
-
-    if(!parentItem || parentItem == m_rootItem) {
-        return QModelIndex();
-    }
+    QObject *childItem = getObject(index);
+    if(childItem) {
+        QObject *parentItem = childItem->parent();
+        if(!parentItem || parentItem == m_rootItem) {
+            return QModelIndex();
+        }
 
-    QObject *superParent = parentItem->parent();
-    if(!superParent) {
-        return QModelIndex();
+        QObject *superParent = parentItem->parent();
+        if(!superParent) {
+            return QModelIndex();
+        }
+        int row = superParent->children().indexOf(parentItem);
+        return createIndex(row, 0, reinterpret_cast<quintptr>(parentItem));
     }
-
-    return createIndex(superParent->children().indexOf(parentItem), 0, parentItem);
+    return QModelIndex();
 }
 
 Qt::ItemFlags BaseObjectModel::flags(const QModelIndex &index) const {
     if(!index.isValid()) {
         return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
     }
-    QObject *item = static_cast<QObject *>(index.internalPointer());
+    QObject *item = getObject(index);
     // only allow change of value attribute
     if(!item || !item->children().isEmpty()) {
         return Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
-    } else {
-        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
     }
+    return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
 QModelIndex BaseObjectModel::getIndex(QObject *object, const QModelIndex &parent) const {
     for(int i = 0; i < rowCount(parent); i++) {
         QModelIndex index = BaseObjectModel::index(i, 0, parent);
-        if(index.internalPointer() == object) {
+        if(getObject(index) == object) {
             return index;
         }
         index = getIndex(object, index);
         if(index.isValid()) {
             return index;
         }
     }
-
     return QModelIndex();
 }
+
+bool BaseObjectModel::removeResource(const QModelIndex &index) {
+    return m_items.remove(index.internalId()) > 0;
+}
+
+void BaseObjectModel::addItem(QObject *object) {
+    m_items[reinterpret_cast<quintptr>(object)] = object;
+}
+
+QObject *BaseObjectModel::getObject(const QModelIndex &index) const {
+    quintptr id = index.internalId();
+    return m_items.value(id, nullptr);
+}
+
+void BaseObjectModel::clear() {
+    foreach(QObject *it, m_rootItem->children()) {
+        it->setParent(nullptr);
+        it->deleteLater();
+    }
+    m_items.clear();
+}
+

worldeditor/src/screens/baseobjectmodel/baseobjectmodel.h

@@ -19,15 +19,21 @@ class BaseObjectModel : public QAbstractItemModel {
 
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    virtual bool removeResource(const QModelIndex &index) { Q_UNUSED(index); return false; }
+    QModelIndex getIndex(QObject *object, const QModelIndex &parent = QModelIndex()) const;
 
-    virtual QString path(const QModelIndex &index) const { Q_UNUSED(index); return QString(); }
+    virtual bool removeResource(const QModelIndex &index);
 
-    QModelIndex getIndex(QObject *object, const QModelIndex &parent = QModelIndex()) const;
+    void addItem(QObject *object);
+
+    QObject *getObject(const QModelIndex &index) const;
+
+    void clear();
 
 protected:
     QObject *m_rootItem;
 
+    QHash<quintptr, QObject *> m_items;
+
 };
 
 #endif // BASEOBJECTMODEL_H

worldeditor/src/screens/componentbrowser/componentbrowser.cpp

@@ -97,8 +97,10 @@ void ComponentBrowser::on_findComponent_textChanged(const QString &arg1) {
 
 void ComponentBrowser::on_componentsTree_clicked(const QModelIndex &index) {
     if(m_proxyModel->rowCount(index) == 0) {
-        QObject *object = static_cast<QObject *>(m_proxyModel->mapToSource(index).internalPointer());
-        emit componentSelected(object->objectName());
+        QObject *object = ComponentModel::instance()->getObject(m_proxyModel->mapToSource(index));
+        if(object) {
+            emit componentSelected(object->objectName());
+        }
     }
 }
 

worldeditor/src/screens/componentbrowser/componentmodel.cpp

@@ -20,11 +20,6 @@ ComponentModel *ComponentModel::instance() {
     return m_pInstance;
 }
 
-void ComponentModel::destroy() {
-    delete m_pInstance;
-    m_pInstance = nullptr;
-}
-
 int ComponentModel::columnCount(const QModelIndex &) const {
     return 3;
 }
@@ -42,7 +37,7 @@ QVariant ComponentModel::data(const QModelIndex &index, int role) const {
     if(!index.isValid()) {
         return QVariant();
     }
-    QObject *item = static_cast<QObject* >(index.internalPointer());
+    QObject *item = getObject(index);
 
     switch(role) {
         case Qt::ToolTipRole:
@@ -60,10 +55,7 @@ QVariant ComponentModel::data(const QModelIndex &index, int role) const {
 }
 
 void ComponentModel::update() {
-    foreach(QObject *it, m_rootItem->children()) {
-        it->setParent(nullptr);
-        it->deleteLater();
-    }
+    clear();
 
     // Iterate all components
     for(const auto &it : ObjectSystem::factories()) {
@@ -85,6 +77,7 @@ void ComponentModel::update() {
                 item = new QObject(p);
                 item->setObjectName(part);
                 item->setProperty(gURI, it.second.data());
+                addItem(item);
             }
             i++;
         }

worldeditor/src/screens/componentbrowser/componentmodel.h

@@ -11,8 +11,6 @@ class ComponentModel : public BaseObjectModel {
 public:
     static ComponentModel *instance();
 
-    static void destroy();
-
     int columnCount(const QModelIndex &) const;
 
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
@@ -26,7 +24,7 @@ public slots:
     ComponentModel();
     ~ComponentModel() {}
 
-    static ComponentModel  *m_pInstance;
+    static ComponentModel *m_pInstance;
 
 };