From 87b43080bac08dbb9a222eea9ab4a84d5730127d Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 30 Jun 2022 00:47:31 -0400
Subject: [PATCH] Fix auto-merge

---
 src/ui/tileseteditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
index 49292b61..ad3dd38b 100644
--- a/src/ui/tileseteditor.cpp
+++ b/src/ui/tileseteditor.cpp
@@ -1072,7 +1072,7 @@ void TilesetEditor::on_copyButton_metatileLabel_clicked() {
     QClipboard * clipboard = QGuiApplication::clipboard();
     QString label = this->ui->lineEdit_metatileLabel->text();
     if (!label.isEmpty()) {
-        Tileset * tileset = Tileset::getMetatileTileset(this->getSelectedMetatile(), this->primaryTileset, this->secondaryTileset);
+        Tileset * tileset = Tileset::getMetatileTileset(this->getSelectedMetatileId(), this->primaryTileset, this->secondaryTileset);
         if (tileset)
             label.prepend("METATILE_" + QString(tileset->name).replace("gTileset_", "") + "_");
     }