diff --git a/src/editor.cpp b/src/editor.cpp index 1e4791b3..56c82aaf 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -1247,6 +1247,7 @@ void Editor::unsetMap() { for (auto connection : map->getConnections()) disconnectMapConnection(connection); } + clearMapConnections(); this->map = nullptr; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e1122c7f..6666196f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -220,23 +220,23 @@ void MainWindow::applyUserShortcuts() { shortcut->setKeys(shortcutsConfig.userShortcuts(shortcut)); } -static const QMap mainTabNames = { - {MainTab::Map, "Map"}, - {MainTab::Events, "Events"}, - {MainTab::Header, "Header"}, - {MainTab::Connections, "Connections"}, - {MainTab::WildPokemon, "Wild Pokemon"}, -}; - -static const QMap mainTabIcons = { - {MainTab::Map, QIcon(QStringLiteral(":/icons/minimap.ico"))}, - {MainTab::Events, QIcon(QStringLiteral(":/icons/viewsprites.ico"))}, - {MainTab::Header, QIcon(QStringLiteral(":/icons/application_form_edit.ico"))}, - {MainTab::Connections, QIcon(QStringLiteral(":/icons/connections.ico"))}, - {MainTab::WildPokemon, QIcon(QStringLiteral(":/icons/tall_grass.ico"))}, -}; - void MainWindow::initCustomUI() { + static const QMap mainTabNames = { + {MainTab::Map, "Map"}, + {MainTab::Events, "Events"}, + {MainTab::Header, "Header"}, + {MainTab::Connections, "Connections"}, + {MainTab::WildPokemon, "Wild Pokemon"}, + }; + + static const QMap mainTabIcons = { + {MainTab::Map, QIcon(QStringLiteral(":/icons/minimap.ico"))}, + {MainTab::Events, QIcon(QStringLiteral(":/icons/viewsprites.ico"))}, + {MainTab::Header, QIcon(QStringLiteral(":/icons/application_form_edit.ico"))}, + {MainTab::Connections, QIcon(QStringLiteral(":/icons/connections.ico"))}, + {MainTab::WildPokemon, QIcon(QStringLiteral(":/icons/tall_grass.ico"))}, + }; + // Set up the tab bar while (ui->mainTabBar->count()) ui->mainTabBar->removeTab(0);