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

fixed crash when CustomMenu doesn't point to a real file

Browse source
This commit is contained in:
markt 2007-04-19 19:12:56 +00:00
parent 622d75f642
commit 3980e3c40a
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.0: Changes for 1.0.0:
*07/04/19:
* Fixed crash when CustomMenu command doesn't point to a file (Mark)
FbCommands.cc
*07/04/17: *07/04/17:
* cosmetic changes (Mathias, thanks Slava Semushin) * cosmetic changes (Mathias, thanks Slava Semushin)
configure.in Screen.cc Keys.cc main.cc FbTk/MenuItem.hh FbTk/Timer.hh configure.in Screen.cc Keys.cc main.cc FbTk/MenuItem.hh FbTk/Timer.hh

2
src/FbCommands.cc
View file

@ -281,6 +281,8 @@ void ShowCustomMenuCmd::execute() {
return; return;
m_menu = MenuCreator::createFromFile(custom_menu_file, m_menu = MenuCreator::createFromFile(custom_menu_file,
screen->screenNumber(), true); screen->screenNumber(), true);
if (!m_menu.get())
return;
::showMenu(*screen, **m_menu); ::showMenu(*screen, **m_menu);
} }