nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug: use expanded style/theme filename

Browse source 
'filename' might contain a '~' which has to be expanded to work for
regular system calls. We expanded 'filename' already but then did not use
it. Fixes bug #3576586.
This commit is contained in:
Mathias Gumz 2012-12-11 19:37:59 +01:00
parent 637381ddaa
commit d8cd6a928b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FbTk/Theme.cc
View file

@ -115,12 +115,13 @@ bool ThemeManager::unregisterTheme(Theme &tm) {
bool ThemeManager::load(const string &filename, bool ThemeManager::load(const string &filename,
const string &overlay_filename, int screen_num) { const string &overlay_filename, int screen_num) {
string location = FbTk::StringUtil::expandFilename(filename); string location = FbTk::StringUtil::expandFilename(filename);
StringUtil::removeTrailingWhitespace(location); StringUtil::removeTrailingWhitespace(location);
StringUtil::removeFirstWhitespace(location); StringUtil::removeFirstWhitespace(location);
string prefix = ""; string prefix = "";
if (FileUtil::isDirectory(filename.c_str())) { if (FileUtil::isDirectory(location.c_str())) {
prefix = location; prefix = location;
location.append("/theme.cfg"); location.append("/theme.cfg");