aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-04-19 19:04:29 (GMT)
committermarkt <markt>2007-04-19 19:04:29 (GMT)
commit04df4191f2383b1752bb03050ed49b80be4a6bca (patch)
tree3dcf0eee4d56cb90f84667ea6fe8489313466f16
parent101939043342440333ad82ac43e9fe27452129b3 (diff)
downloadfluxbox-04df4191f2383b1752bb03050ed49b80be4a6bca.zip
fluxbox-04df4191f2383b1752bb03050ed49b80be4a6bca.tar.bz2
fixed crash when CustomMenu doesn't point to a real file
-rw-r--r--src/FbCommands.cc2
1 files changed, 2 insertions, 0 deletions
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