atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash switching between projects

Browse source
This commit is contained in:
GriffinR 2021-12-08 11:10:43 -05:00 committed by huderlem
parent 03949d45a4
commit 6518ba36b3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/editor.cpp
View file

@ -1348,7 +1348,6 @@ void Editor::displayMetatileSelector() {
metatile_selector_item->scene()->removeItem(metatile_selector_item); metatile_selector_item->scene()->removeItem(metatile_selector_item);
delete scene_metatiles; delete scene_metatiles;
} }
scene_metatiles = new QGraphicsScene; scene_metatiles = new QGraphicsScene;
if (!metatile_selector_item) { if (!metatile_selector_item) {
metatile_selector_item = new MetatileSelector(8, map); metatile_selector_item = new MetatileSelector(8, map);
@ -1362,10 +1361,10 @@ void Editor::displayMetatileSelector() {
} else { } else {
metatile_selector_item->setMap(map); metatile_selector_item->setMap(map);
if (metatile_selector_item->primaryTileset if (metatile_selector_item->primaryTileset
&& metatile_selector_item->primaryTileset->name != map->layout->tileset_primary->name) && metatile_selector_item->primaryTileset != map->layout->tileset_primary)
emit tilesetUpdated(map->layout->tileset_primary->name); emit tilesetUpdated(map->layout->tileset_primary->name);
if (metatile_selector_item->secondaryTileset if (metatile_selector_item->secondaryTileset
&& metatile_selector_item->secondaryTileset->name != map->layout->tileset_secondary->name) && metatile_selector_item->secondaryTileset != map->layout->tileset_secondary)
emit tilesetUpdated(map->layout->tileset_secondary->name); emit tilesetUpdated(map->layout->tileset_secondary->name);
metatile_selector_item->setTilesets(map->layout->tileset_primary, map->layout->tileset_secondary); metatile_selector_item->setTilesets(map->layout->tileset_primary, map->layout->tileset_secondary);
} }