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:33 +0100 |
| commit | f89b9d8b8064a2f323f5b3362f88cb873bad8fcc (patch) | |
| tree | c49206a9b88068dad8fc0cbc13ccca09fc02a557 | |
| parent | 9b7dfb10641ba7978ffcbd1db0507163411ae027 (diff) | |
Resolves: tdf#100248 vcl menu scroll timer still active post dispose
Change-Id: I8988a42e7e505c967661c4a5f3c1e4ef3fbc08e0
| -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 02b9d2f8d40b..93ad9879d638 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(); } } |