From edcb8f928530982f06698aa6121930411d4c7ea5 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 8 Apr 2019 00:17:30 -0400 Subject: [PATCH] Only commit metatile label if it changes --- src/ui/tileseteditor.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index 49119430..1db0ad5b 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -324,7 +324,8 @@ void TilesetEditor::on_lineEdit_metatileLabel_editingFinished() void TilesetEditor::saveMetatileLabel() { - if (this->metatile) { + // Only commit if the field has changed. + if (this->metatile && this->metatile->label != this->ui->lineEdit_metatileLabel->text()) { Metatile *prevMetatile = this->metatile->copy(); this->metatile->label = this->ui->lineEdit_metatileLabel->text(); MetatileHistoryItem *commit = new MetatileHistoryItem(metatileSelector->getSelectedMetatile(), prevMetatile, this->metatile->copy()); @@ -344,11 +345,7 @@ void TilesetEditor::on_comboBox_layerType_activated(int layerType) void TilesetEditor::on_actionSave_Tileset_triggered() { - if (this->metatile) { - if (this->metatile->label != this->ui->lineEdit_metatileLabel->text()) { - saveMetatileLabel(); - } - } + saveMetatileLabel(); this->project->saveTilesets(this->primaryTileset, this->secondaryTileset); emit this->tilesetsSaved(this->primaryTileset->name, this->secondaryTileset->name);