aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorMatteo Galiazzo <matteo@maltesenarrazioni.it>2008-05-14 08:40:53 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-05-14 08:40:53 (GMT)
commitaf0f2419541aa7edccce74267c839b830f14d381 (patch)
tree1a4a97c6badf7fd4b783f6ccf1e0228169803a68 /src/FbTk
parent7f45bae4629f345906e96c1fcb3a3d1e49c36382 (diff)
downloadfluxbox-af0f2419541aa7edccce74267c839b830f14d381.zip
fluxbox-af0f2419541aa7edccce74267c839b830f14d381.tar.bz2
don't save rc in SetStyle command if loading the style fails
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Theme.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 46c9a56..cd478fc 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -117,6 +117,8 @@ bool ThemeManager::unregisterTheme(Theme &tm) {
117bool ThemeManager::load(const string &filename, 117bool ThemeManager::load(const string &filename,
118 const string &overlay_filename, int screen_num) { 118 const string &overlay_filename, int screen_num) {
119 string location = FbTk::StringUtil::expandFilename(filename); 119 string location = FbTk::StringUtil::expandFilename(filename);
120 StringUtil::removeTrailingWhitespace(location);
121 StringUtil::removeFirstWhitespace(location);
120 string prefix = ""; 122 string prefix = "";
121 123
122 if (FileUtil::isDirectory(filename.c_str())) { 124 if (FileUtil::isDirectory(filename.c_str())) {