summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-04-19 19:12:56 (GMT)
committermarkt <markt>2007-04-19 19:12:56 (GMT)
commit3980e3c40a0ca4da702e53368b63c923824d224c (patch)
tree70294dc31f0df907d6b5fb47f11f9152eacb9995
parent622d75f6429ebeb949b13d68c1ca188d7b5c8093 (diff)
downloadfluxbox_lack-3980e3c40a0ca4da702e53368b63c923824d224c.zip
fluxbox_lack-3980e3c40a0ca4da702e53368b63c923824d224c.tar.bz2
fixed crash when CustomMenu doesn't point to a real file
-rw-r--r--ChangeLog3
-rw-r--r--src/FbCommands.cc2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9674e05..bf7d664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/04/19:
4 * Fixed crash when CustomMenu command doesn't point to a file (Mark)
5 FbCommands.cc
3*07/04/17: 6*07/04/17:
4 * cosmetic changes (Mathias, thanks Slava Semushin) 7 * cosmetic changes (Mathias, thanks Slava Semushin)
5 configure.in Screen.cc Keys.cc main.cc FbTk/MenuItem.hh FbTk/Timer.hh 8 configure.in Screen.cc Keys.cc main.cc FbTk/MenuItem.hh FbTk/Timer.hh
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 20d45e0..060f4d3 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -281,6 +281,8 @@ void ShowCustomMenuCmd::execute() {
281 return; 281 return;
282 m_menu = MenuCreator::createFromFile(custom_menu_file, 282 m_menu = MenuCreator::createFromFile(custom_menu_file,
283 screen->screenNumber(), true); 283 screen->screenNumber(), true);
284 if (!m_menu.get())
285 return;
284 ::showMenu(*screen, **m_menu); 286 ::showMenu(*screen, **m_menu);
285} 287}
286 288