diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-09 17:02:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-09 17:19:56 +0100 |
| commit | 7def34c0f013b0c9ac1b8ee39e800577bfa800e7 (patch) | |
| tree | ae188cf6b0a1bd20402f0aaf0cf5ddf6b6d4934f /vcl/source | |
| parent | 511ebf799457d41429554d26ec30934435146ece (diff) | |
Resolves: tdf#100248 vcl menu scroll timer still active post dispose
Change-Id: I8988a42e7e505c967661c4a5f3c1e4ef3fbc08e0
(cherry picked from commit f89b9d8b8064a2f323f5b3362f88cb873bad8fcc)
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 50c8f23db69d..c00a86926ede 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -98,6 +98,12 @@ void MenuFloatingWindow::doShutdown() } pMenu = nullptr; RemoveEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); + + aScrollTimer.Stop(); + aSubmenuCloseTimer.Stop(); + aSubmenuCloseTimer.Stop(); + aHighlightChangedTimer.Stop(); + aHighlightChangedTimer.Stop(); } } |