From f049c1b99ed41e5ccf6100cb12a0f443481b4ea5 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Mon, 7 Sep 2009 15:40:44 +0200
Subject: Fix a crash in the Win32 event dispatcher

Not clearing the timerVec and timerDict containers can cause crashes during
application shutdown when code tries to unregister timers (that were
unregistered in closingDown()).

Reviewed-by: dt
---
 src/corelib/kernel/qeventdispatcher_win.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 9c308a3..c6ac6d4 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -1021,6 +1021,8 @@ void QEventDispatcherWin32::closingDown()
     // clean up any timers
     for (int i = 0; i < d->timerVec.count(); ++i)
         d->unregisterTimer(d->timerVec.at(i), true);
+    d->timerVec.clear();
+    d->timerDict.clear();
 }
 
 bool QEventDispatcherWin32::event(QEvent *e)
-- 
cgit v0.12