Resolve relative UI theme paths

TurboTheTurtle · glassez · commit 5732a6b62093 · 2026-06-27T11:56:40.000+03:00
PR qbittorrent#24514. Closes qbittorrent#24489.
diff --git a/src/gui/uithememanager.cpp b/src/gui/uithememanager.cpp
@@ -40,6 +40,7 @@
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/path.h"
+#include "base/profile.h"
 #include "base/preferences.h"
 #include "uithemecommon.h"
 
@@ -51,6 +52,11 @@ namespace
         const QColor &color = palette.color(QPalette::Active, QPalette::Base);
         return (color.lightness() < 127);
     }
+
+    Path resolveThemePath(const Path &themePath)
+    {
+        return (themePath.isAbsolute() ? themePath : (Profile::instance()->rootPath() / themePath));
+    }
 }
 
 UIThemeManager *UIThemeManager::m_instance = nullptr;
@@ -91,7 +97,7 @@ UIThemeManager::UIThemeManager()
 
     if (m_useCustomTheme)
     {
-        const Path themePath = Preferences::instance()->customUIThemePath();
+        const Path themePath = resolveThemePath(Preferences::instance()->customUIThemePath());
 
         if (themePath.hasExtension(u".qbtheme"_s))
         {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`#include "base/global.h"`
`41`	`41`	`#include "base/logger.h"`
`42`	`42`	`#include "base/path.h"`
	`43`	`+#include "base/profile.h"`
`43`	`44`	`#include "base/preferences.h"`
`44`	`45`	`#include "uithemecommon.h"`
`45`	`46`
`@@ -51,6 +52,11 @@ namespace`
`51`	`52`	`const QColor &color = palette.color(QPalette::Active, QPalette::Base);`
`52`	`53`	`return (color.lightness() < 127);`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ Path resolveThemePath(const Path &themePath)`
	`57`	`+ {`
	`58`	`+ return (themePath.isAbsolute() ? themePath : (Profile::instance()->rootPath() / themePath));`
	`59`	`+ }`
`54`	`60`	`}`
`55`	`61`
`56`	`62`	`UIThemeManager *UIThemeManager::m_instance = nullptr;`
`@@ -91,7 +97,7 @@ UIThemeManager::UIThemeManager()`
`91`	`97`
`92`	`98`	`if (m_useCustomTheme)`
`93`	`99`	`{`
`94`		`- const Path themePath = Preferences::instance()->customUIThemePath();`
	`100`	`+ const Path themePath = resolveThemePath(Preferences::instance()->customUIThemePath());`
`95`	`101`
`96`	`102`	`if (themePath.hasExtension(u".qbtheme"_s))`
`97`	`103`	`{`