[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/menufloatingwindow.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 11ca1ad43cc2def184ff7629e3880ccab6b8a1f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 9 17:02:14 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 2128f08..1cb95ed 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();
     }
 }