diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-09 17:02:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-11 10:04:40 +0200 |
| commit | 88c3ed5c2d017df572f5a5c90d17fcfb3507804b (patch) | |
| tree | f8316d6ef96191f737f1129a424e765714672e10 /vcl | |
| parent | bcda6e863371792f48d46f035b04512f2fa04123 (diff) | |
Resolves: tdf#100248 vcl menu scroll timer still active post dispose
Change-Id: I8988a42e7e505c967661c4a5f3c1e4ef3fbc08e0
(cherry picked from commit f89b9d8b8064a2f323f5b3362f88cb873bad8fcc)
(cherry picked from commit 7def34c0f013b0c9ac1b8ee39e800577bfa800e7)
Reviewed-on: https://gerrit.libreoffice.org/26125
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 11ca1ad43cc2def184ff7629e3880ccab6b8a1f1)
Diffstat (limited to 'vcl')
| -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 2128f08cce28..1cb95ed18f87 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -100,6 +100,12 @@ void MenuFloatingWindow::doShutdown() } pMenu = nullptr; RemoveEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); + + aScrollTimer.Stop(); + aSubmenuCloseTimer.Stop(); + aSubmenuCloseTimer.Stop(); + aHighlightChangedTimer.Stop(); + aHighlightChangedTimer.Stop(); } } |