Skins: append / when setting skin base path

Tthis ensures stylesheet icon urls without leading / are transformed correctly
mixxxdj · Jul 27, 2021 · 7859b10 · 7859b10
1 parent c0f4d96
commit 7859b10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
@@ -410,7 +410,7 @@ QWidget* LegacySkinParser::parseSkin(const QString& skinPath, QWidget* pParent)
 
 LaunchImage* LegacySkinParser::parseLaunchImage(const QString& skinPath, QWidget* pParent) {
     m_pContext = std::make_unique<SkinContext>(m_pConfig, skinPath + "/skin.xml");
-    m_pContext->setSkinBasePath(skinPath + "/");
+    m_pContext->setSkinBasePath(skinPath);
 
     QDomElement skinDocument = openSkin(skinPath);
     if (skinDocument.isNull()) {
@@ -2308,7 +2308,5 @@ QString LegacySkinParser::stylesheetAbsIconPaths(QString& style) {
     // <Style> nodes) with absolute file paths.
     // TODO Can be removed/disabled as soon as all target distros have the fixed
     // package in their repo.
-    // Note: It's safe to use the base path after parseSkin() has updated it
-    // (parseLaunchImage() appends "/" earlier)
     return style.replace("url(skin:", "url(" + m_pContext->getSkinBasePath());
 }
diff --git a/src/skin/legacy/skincontext.h b/src/skin/legacy/skincontext.h
@@ -55,7 +55,7 @@ class SkinContext {
     void setSkinBasePath(const QString& skinBasePath) {
         QStringList skinPaths(skinBasePath);
         QDir::setSearchPaths("skin", skinPaths);
-        m_skinBasePath = skinBasePath;
+        m_skinBasePath = skinBasePath + "/";
     }
 
     // Sets the base path used by getSkinPath.