From 688c5d2a12a9aeba2544306f5a7add10680d5d14 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Mon, 27 Jul 2026 12:59:57 +0200
Subject: [PATCH] Fix up a small rebase/merge conflict (#7061)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Took 2 minutes


Took 5 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../src/interface/palette_editor/palette_editor_dialog.cpp     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
index e01a1caa2..adae6e152 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
@@ -20,6 +20,7 @@
 #include <QPushButton>
 #include <QStyleHints>
 #include <QTimer>
+#include <libcockatrice/settings/paths_settings.h>
 
 // Probe whether a directory is truly writable by trying to create and remove a
 // temporary file. QFileInfo::isWritable() on a directory is unreliable (notably
@@ -48,7 +49,7 @@ PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QSt
     if (!themeDirPath.isEmpty() && isDirReallyWritable(themeDirPath)) {
         saveDir = themeDirPath;
     } else {
-        saveDir = QDir(SettingsCache::instance().getThemesPath()).absoluteFilePath(themeName);
+        saveDir = QDir(SettingsCache::instance().paths().getThemesPath()).absoluteFilePath(themeName);
         if (!QDir().mkpath(saveDir)) {
             qWarning() << "Failed to create palette save directory:" << saveDir;
         }