aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-08-10 12:50:04 (GMT)
committerrathnor <rathnor>2003-08-10 12:50:04 (GMT)
commitc8c5072fd1a542cc3783cb5b32e5e4b68e45efe7 (patch)
tree29e6bab43c762e475844e8d42080ffd939db870b /src/fluxbox.cc
parentbabf480280200fa4af3d8ab917a9f9ad76a6309c (diff)
downloadfluxbox-c8c5072fd1a542cc3783cb5b32e5e4b68e45efe7.zip
fluxbox-c8c5072fd1a542cc3783cb5b32e5e4b68e45efe7.tar.bz2
fix ~ to work properly in session.menuFile
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 342338c..f910e7b 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.178 2003/08/04 18:16:22 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.179 2003/08/10 12:50:04 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1625,13 +1625,8 @@ void Fluxbox::load_rc() {
1625 1625
1626 XrmValue value; 1626 XrmValue value;
1627 char *value_type; 1627 char *value_type;
1628 1628 if (m_rc_menufile->size() == 0)
1629 if (m_rc_menufile->size()) {
1630 *m_rc_menufile = StringUtil::expandFilename(*m_rc_menufile);
1631 if (!m_rc_menufile->size())
1632 m_rc_menufile.setDefaultValue(); 1629 m_rc_menufile.setDefaultValue();
1633 } else
1634 m_rc_menufile.setDefaultValue();
1635 1630
1636 if (m_rc_slitlistfile->size() != 0) { 1631 if (m_rc_slitlistfile->size() != 0) {
1637 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile); 1632 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);