summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-30 00:00:39 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-30 00:00:39 +0300
commit82f54003e520947340823e8d86dcb8c57e182237 (patch)
tree39dc448711387eb9ca2ebc57258337cd53ea172f /src
parentd1cd33938cc4218bd6a693af0d22620d0ac5dbf9 (diff)
downloadmv-82f54003e520947340823e8d86dcb8c57e182237.tar.gz
mv-82f54003e520947340823e8d86dcb8c57e182237.tar.bz2
mv-82f54003e520947340823e8d86dcb8c57e182237.tar.xz
mv-82f54003e520947340823e8d86dcb8c57e182237.zip
Add screenshots option in branding file.
Example: <option name="screenshots" value="EvolOnline"/>
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp2
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/gui/widgets/desktop.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 3803b08b5..ceff605ff 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2261,7 +2261,7 @@ void Client::initScreenshotDir()
if (config.getBoolValue("useScreenshotDirectorySuffix"))
{
const std::string configScreenshotSuffix =
- branding.getValue("appShort", "mana");
+ branding.getValue("screenshots", "ManaPlus");
if (!configScreenshotSuffix.empty())
{
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 11ebec96b..9fb64e7a7 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -380,6 +380,7 @@ DefaultsData* getBrandingDefaults()
"http://manaplus.org/serverlist.xml");
AddDEF("onlineServerFile", "serverlistplus.xml");
AddDEF("appShort", "mana");
+ AddDEF("screenshots", "ManaPlus");
AddDEF("defaultUpdateHost", "");
AddDEF("helpPath", "");
AddDEF("theme", "");
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 56450cd1f..7f3532381 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -45,7 +45,7 @@ Desktop::Desktop(const Widget2 *const widget) :
Wallpaper::loadWallpapers();
- std::string appName = branding.getValue("appName", std::string(""));
+ std::string appName = branding.getValue("appName", std::string());
if (appName.empty())
{