jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-29 12:20:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix up a small rebase/merge conflict (#7061)

Browse source 
Took 2 minutes


Took 5 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-07-27 12:59:57 +02:00 • committed by GitHub
parent 61b9d7abf6
commit 688c5d2a12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
View file

@ -20,6 +20,7 @@
#include <QPushButton> #include <QPushButton>
#include <QStyleHints> #include <QStyleHints>
#include <QTimer> #include <QTimer>
#include <libcockatrice/settings/paths_settings.h>
// Probe whether a directory is truly writable by trying to create and remove a // Probe whether a directory is truly writable by trying to create and remove a
// temporary file. QFileInfo::isWritable() on a directory is unreliable (notably // 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)) { if (!themeDirPath.isEmpty() && isDirReallyWritable(themeDirPath)) {
saveDir = themeDirPath; saveDir = themeDirPath;
} else { } else {
saveDir = QDir(SettingsCache::instance().getThemesPath()).absoluteFilePath(themeName); saveDir = QDir(SettingsCache::instance().paths().getThemesPath()).absoluteFilePath(themeName);
if (!QDir().mkpath(saveDir)) { if (!QDir().mkpath(saveDir)) {
qWarning() << "Failed to create palette save directory:" << saveDir; qWarning() << "Failed to create palette save directory:" << saveDir;
} }