diff options
author | Mathias Gumz <akira@fluxbox.org> | 2015-02-01 07:07:26 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2015-02-01 07:07:26 (GMT) |
commit | e1359adfd064d12bbf2bfb899ee99f07c2c7c712 (patch) | |
tree | 91601cee2d9af901fdfb3b1ebeb2931b53da09b5 /src/Screen.cc | |
parent | 017de68d5e5c5bc50c23f77e84abee7f05cf2985 (diff) | |
download | fluxbox-e1359adfd064d12bbf2bfb899ee99f07c2c7c712.zip fluxbox-e1359adfd064d12bbf2bfb899ee99f07c2c7c712.tar.bz2 |
Cosmetic
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index da4e719..2b5411d 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1290,9 +1290,11 @@ void BScreen::rereadMenu() { | |||
1290 | } | 1290 | } |
1291 | 1291 | ||
1292 | const std::string BScreen::windowMenuFilename() const { | 1292 | const std::string BScreen::windowMenuFilename() const { |
1293 | if ((*resource.windowmenufile).empty()) | 1293 | std::string name = *resource.windowmenufile; |
1294 | return Fluxbox::instance()->getDefaultDataFilename("windowmenu"); | 1294 | if (name.empty()) { |
1295 | return *resource.windowmenufile; | 1295 | name = Fluxbox::instance()->getDefaultDataFilename("windowmenu"); |
1296 | } | ||
1297 | return name; | ||
1296 | } | 1298 | } |
1297 | 1299 | ||
1298 | void BScreen::rereadWindowMenu() { | 1300 | void BScreen::rereadWindowMenu() { |