Applied modified version of patch in bug report [ 1195983 ] Multiple wxTimers work...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index b8e4c1e1c7c6d198d5ef757642947ce3ed78bea7..406fb93634419056a9d71da7920e5d95ac145333 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -147,7 +147,6 @@ void wxTimerScheduler::NotifyTimers()
         {
             if ( desc->running && desc->shotTime <= now )
             {
-                desc = m_timers;
                 oneShot = desc->timer->IsOneShot();
                 RemoveTimer(desc);
 
@@ -167,6 +166,8 @@ void wxTimerScheduler::NotifyTimers()
                     if ( !oneShot )
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }
+                else
+                    desc = m_timers;
             }
         }
     }