diff options
author | markt <markt> | 2007-09-08 18:41:03 (GMT) |
---|---|---|
committer | markt <markt> | 2007-09-08 18:41:03 (GMT) |
commit | 6a21f547072ce992c9b3255eb47dcfb5e748e531 (patch) | |
tree | 785916b2699d1c09c1e7003158c1e7427fdde761 /src/FbTk/MenuItem.cc | |
parent | 667d4d301441cb3ef7fdb189d383da084fb80b23 (diff) | |
download | fluxbox-6a21f547072ce992c9b3255eb47dcfb5e748e531.zip fluxbox-6a21f547072ce992c9b3255eb47dcfb5e748e531.tar.bz2 |
fix crash from changing toolbar visibility, some cleanup, and porting change from trunk
Diffstat (limited to 'src/FbTk/MenuItem.cc')
-rw-r--r-- | src/FbTk/MenuItem.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc index b598c47..2576d2b 100644 --- a/src/FbTk/MenuItem.cc +++ b/src/FbTk/MenuItem.cc | |||
@@ -34,8 +34,11 @@ | |||
34 | namespace FbTk { | 34 | namespace FbTk { |
35 | 35 | ||
36 | void MenuItem::click(int button, int time) { | 36 | void MenuItem::click(int button, int time) { |
37 | if (m_command.get() != 0) | 37 | if (m_command.get() != 0) { |
38 | m_command->execute(); | 38 | // we need a local variable, since the command may destroy this object |
39 | RefCount<Command> tmp(m_command); | ||
40 | tmp->execute(); | ||
41 | } | ||
39 | } | 42 | } |
40 | 43 | ||
41 | void MenuItem::drawLine(FbDrawable &draw, const MenuTheme &theme, size_t size, | 44 | void MenuItem::drawLine(FbDrawable &draw, const MenuTheme &theme, size_t size, |