From d48436b8e2cd25583de1eb8c8d85ab0626490c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Thu, 25 Jun 2026 11:28:12 +0200 Subject: [PATCH] Fix portable rizin system themes loading (#3632) Regression introduced in 4e53fd64 for the macOS application bundle: rz_path_set_prefix() is only applied to the core-global RzPath instance, but the ColorThemeWorker created its own instance, ignoring this setting. This led to the message box saying "The Rizin standard themes could not be found in..." on startup. --- src/common/ColorThemeWorker.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/ColorThemeWorker.cpp b/src/common/ColorThemeWorker.cpp index 828ea5bf..847cd485 100644 --- a/src/common/ColorThemeWorker.cpp +++ b/src/common/ColorThemeWorker.cpp @@ -56,8 +56,8 @@ ColorThemeWorker::ColorThemeWorker(QObject *parent) : QObject(parent) QDir().mkpath(customRzThemesLocationPath); } - RzPath *sysPath = rz_path_new(); - const char *themeDir = rz_path_system(sysPath, RZ_THEMES); + RzCoreLocked core = Core()->lock(); + const char *themeDir = rz_path_system(core->sys_path, RZ_THEMES); const QDir currDir { themeDir }; if (currDir.exists()) { standardRzThemesLocationPath = currDir.absolutePath(); @@ -67,7 +67,6 @@ ColorThemeWorker::ColorThemeWorker(QObject *parent) : QObject(parent) "Most likely, Rizin is not properly installed.") .arg(currDir.path())); } - rz_path_free(sysPath); } QColor ColorThemeWorker::mergeColors(const QColor &upper, const QColor &lower) const