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

Fix some crashes on project close

Browse source
This commit is contained in:
GriffinR 2022-10-27 22:11:10 -04:00
parent ce6abb0a81
commit 37b5656376
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/ui/eventframes.h
View file

@ -67,10 +67,6 @@ public:
ObjectFrame(ObjectEvent *object, QWidget *parent = nullptr) ObjectFrame(ObjectEvent *object, QWidget *parent = nullptr)
: EventFrame(object, parent), object(object) {} : EventFrame(object, parent), object(object) {}
virtual ~ObjectFrame() {
delete this->scriptCompleter;
}
virtual void setup() override; virtual void setup() override;
virtual void initialize() override; virtual void initialize() override;
virtual void connectSignals() override; virtual void connectSignals() override;
@ -148,10 +144,6 @@ public:
TriggerFrame(TriggerEvent *trigger, QWidget *parent = nullptr) TriggerFrame(TriggerEvent *trigger, QWidget *parent = nullptr)
: EventFrame(trigger, parent), trigger(trigger) {} : EventFrame(trigger, parent), trigger(trigger) {}
virtual ~TriggerFrame() {
delete this->scriptCompleter;
}
virtual void setup() override; virtual void setup() override;
virtual void initialize() override; virtual void initialize() override;
virtual void connectSignals() override; virtual void connectSignals() override;
@ -198,10 +190,6 @@ public:
SignFrame(SignEvent *sign, QWidget *parent = nullptr) SignFrame(SignEvent *sign, QWidget *parent = nullptr)
: EventFrame(sign, parent), sign(sign) {} : EventFrame(sign, parent), sign(sign) {}
virtual ~SignFrame() {
delete this->scriptCompleter;
}
virtual void setup() override; virtual void setup() override;
virtual void initialize() override; virtual void initialize() override;
virtual void connectSignals() override; virtual void connectSignals() override;

15
src/core/tileset.cpp
View file

@ -18,12 +18,15 @@ Tileset::Tileset(const Tileset &other)
metatile_attrs_label(other.metatile_attrs_label), metatile_attrs_label(other.metatile_attrs_label),
metatile_attrs_path(other.metatile_attrs_path), metatile_attrs_path(other.metatile_attrs_path),
tilesImagePath(other.tilesImagePath), tilesImagePath(other.tilesImagePath),
tilesImage(other.tilesImage), tilesImage(other.tilesImage.copy()),
palettePaths(other.palettePaths), palettePaths(other.palettePaths),
tiles(other.tiles),
palettes(other.palettes), palettes(other.palettes),
palettePreviews(other.palettePreviews) palettePreviews(other.palettePreviews)
{ {
for (auto tile : other.tiles) {
tiles.append(tile.copy());
}
for (auto *metatile : other.metatiles) { for (auto *metatile : other.metatiles) {
metatiles.append(new Metatile(*metatile)); metatiles.append(new Metatile(*metatile));
} }
@ -39,12 +42,16 @@ Tileset &Tileset::operator=(const Tileset &other) {
metatile_attrs_label = other.metatile_attrs_label; metatile_attrs_label = other.metatile_attrs_label;
metatile_attrs_path = other.metatile_attrs_path; metatile_attrs_path = other.metatile_attrs_path;
tilesImagePath = other.tilesImagePath; tilesImagePath = other.tilesImagePath;
tilesImage = other.tilesImage; tilesImage = other.tilesImage.copy();
palettePaths = other.palettePaths; palettePaths = other.palettePaths;
tiles = other.tiles;
palettes = other.palettes; palettes = other.palettes;
palettePreviews = other.palettePreviews; palettePreviews = other.palettePreviews;
tiles.clear();
for (auto tile : other.tiles) {
tiles.append(tile.copy());
}
metatiles.clear(); metatiles.clear();
for (auto *metatile : other.metatiles) { for (auto *metatile : other.metatiles) {
metatiles.append(new Metatile(*metatile)); metatiles.append(new Metatile(*metatile));