summaryrefslogtreecommitdiff
path: root/src/gui/theme.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-02 06:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit49631972db5b965413d4bbe36983a8d5bd203183 (patch)
treecb31545521cb4b33e65f8e94e7f2d5cd33e9e7a1 /src/gui/theme.cpp
parentbe7786e70668c014b19263895a6c8f507ed8161d (diff)
downloadmv-49631972db5b965413d4bbe36983a8d5bd203183.tar.gz
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.bz2
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.xz
mv-49631972db5b965413d4bbe36983a8d5bd203183.zip
Use pathJoin for concatinate some paths.
Diffstat (limited to 'src/gui/theme.cpp')
-rw-r--r--src/gui/theme.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index bffd212f7..b68fa011d 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1004,7 +1004,7 @@ void Theme::loadColors(std::string file)
if (file.empty())
file = "colors.xml";
else
- file.append("/colors.xml");
+ file = pathJoin(file, "colors.xml");
XML::Document *const doc = Loader::getXml(resolveThemePath(file),
UseVirtFs_true,
@@ -1211,8 +1211,9 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
}
else
{
- path = std::string(defaultThemePath).append(
- themeName).append("/info.xml");
+ path = pathJoin(defaultThemePath,
+ themeName,
+ "info.xml");
}
logger->log("loading: " + path);
XML::Document *const doc = Loader::getXml(path,