summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-24 13:51:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-24 13:51:40 +0300
commit779b65f15d3350b2d95a095e24a90526c64dcecb (patch)
treee86085946455c344a0cc4361467a384f95ba5d49 /src/client.cpp
parent366315b1909281354b5f86870aa9289d1a533e0d (diff)
downloadmv-779b65f15d3350b2d95a095e24a90526c64dcecb.tar.gz
mv-779b65f15d3350b2d95a095e24a90526c64dcecb.tar.bz2
mv-779b65f15d3350b2d95a095e24a90526c64dcecb.tar.xz
mv-779b65f15d3350b2d95a095e24a90526c64dcecb.zip
load branding info from portable.xml if branding file missing.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 0babef941..86a0ec094 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1914,6 +1914,12 @@ void Client::initRootDir()
Configuration portable;
portable.init(portableName);
+ if (mOptions.brandingPath.empty())
+ {
+ branding.init(portableName);
+ branding.setDefaultValues(getBrandingDefaults());
+ }
+
logger->log("Portable file: %s", portableName.c_str());
if (mOptions.localDataDir.empty())