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

Only commit metatile label if it changes

Browse source
This commit is contained in:
Phlosioneer 2019-04-08 00:17:30 -04:00
parent 03186e4591
commit edcb8f9285
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ui/tileseteditor.cpp
View file

@ -324,7 +324,8 @@ void TilesetEditor::on_lineEdit_metatileLabel_editingFinished()
void TilesetEditor::saveMetatileLabel() 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(); Metatile *prevMetatile = this->metatile->copy();
this->metatile->label = this->ui->lineEdit_metatileLabel->text(); this->metatile->label = this->ui->lineEdit_metatileLabel->text();
MetatileHistoryItem *commit = new MetatileHistoryItem(metatileSelector->getSelectedMetatile(), prevMetatile, this->metatile->copy()); 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() void TilesetEditor::on_actionSave_Tileset_triggered()
{ {
if (this->metatile) { saveMetatileLabel();
if (this->metatile->label != this->ui->lineEdit_metatileLabel->text()) {
saveMetatileLabel();
}
}
this->project->saveTilesets(this->primaryTileset, this->secondaryTileset); this->project->saveTilesets(this->primaryTileset, this->secondaryTileset);
emit this->tilesetsSaved(this->primaryTileset->name, this->secondaryTileset->name); emit this->tilesetsSaved(this->primaryTileset->name, this->secondaryTileset->name);