From 90aba5e4331cf2d82089ef0bb4aa73b87183caae Mon Sep 17 00:00:00 2001 From: garakmon Date: Wed, 19 Aug 2020 19:30:35 -0400 Subject: [PATCH] define a setMap for current_metatile_selection_item to prevent crash on project transition --- include/ui/currentselectedmetatilespixmapitem.h | 2 ++ src/editor.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/include/ui/currentselectedmetatilespixmapitem.h b/include/ui/currentselectedmetatilespixmapitem.h index 70b3b29e..0bc8e0e3 100644 --- a/include/ui/currentselectedmetatilespixmapitem.h +++ b/include/ui/currentselectedmetatilespixmapitem.h @@ -15,6 +15,8 @@ public: Map* map = nullptr; MetatileSelector *metatileSelector; void draw(); + + void setMap(Map *map) { this->map = map; } }; #endif // CURRENTSELECTEDMETATILESPIXMAPITEM_H diff --git a/src/editor.cpp b/src/editor.cpp index f35e7e8e..505d7699 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -1299,6 +1299,7 @@ void Editor::displayCurrentMetatilesSelection() { void Editor::redrawCurrentMetatilesSelection() { if (current_metatile_selection_item) { + current_metatile_selection_item->setMap(map); current_metatile_selection_item->draw(); emit currentMetatilesSelectionChanged(); }