diff --git a/include/ui/prefab.h b/include/ui/prefab.h index 18bbda1c..00b2d714 100644 --- a/include/ui/prefab.h +++ b/include/ui/prefab.h @@ -23,7 +23,7 @@ public: void initPrefabUI(MetatileSelector *selector, QWidget *prefabWidget, QLabel *emptyPrefabLabel, Map *map); void addPrefab(MetatileSelection selection, Map *map, QString name); void updatePrefabUi(Map *map); - void handlePrefabImport(); + void tryImportDefaultPrefabs(Map *map); private: MetatileSelector *selector; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a5e14b06..ff507326 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1697,6 +1697,7 @@ void MainWindow::on_mapViewTab_tabBarClicked(int index) editor->setEditingCollision(); } else if (index == 2) { editor->setEditingMap(); + prefab.tryImportDefaultPrefabs(this->editor->map); } editor->setCursorRectVisible(false); } diff --git a/src/ui/prefab.cpp b/src/ui/prefab.cpp index 150ed323..e9e3b3b0 100644 --- a/src/ui/prefab.cpp +++ b/src/ui/prefab.cpp @@ -159,7 +159,6 @@ void Prefab::initPrefabUI(MetatileSelector *selector, QWidget *prefabWidget, QLa this->selector = selector; this->prefabWidget = prefabWidget; this->emptyPrefabLabel = emptyPrefabLabel; - this->handlePrefabImport(); this->loadPrefabs(); this->updatePrefabUi(map); } @@ -270,7 +269,7 @@ void Prefab::addPrefab(MetatileSelection selection, Map *map, QString name) { this->updatePrefabUi(map); } -void Prefab::handlePrefabImport() { +void Prefab::tryImportDefaultPrefabs(Map *map) { BaseGameVersion version = projectConfig.getBaseGameVersion(); // Ensure we have default prefabs for the project's game version. if (version != BaseGameVersion::pokeruby && version != BaseGameVersion::pokeemerald && version != BaseGameVersion::pokefirered) @@ -330,6 +329,8 @@ void Prefab::handlePrefabImport() { prefabsFile.write(content.toUtf8()); prefabsFile.close(); + this->loadPrefabs(); + this->updatePrefabUi(map); } projectConfig.setPrefabImportPrompted(true);