From 779b65f15d3350b2d95a095e24a90526c64dcecb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 24 Feb 2014 13:51:40 +0300
Subject: load branding info from portable.xml if branding file missing.

---
 src/client.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/client.cpp')

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())
-- 
cgit v1.2.3-60-g2f50