From 925fcf5f1b38c232b2156b8e85987ef75df6d4e3 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 21 May 2005 17:11:16 +0000
Subject: [PATCH] Applied modified version of patch in bug report [ 1195983 ]
 Multiple wxTimers work incorrectly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/timer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index b8e4c1e1c7..406fb93634 100644
--- 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;
             }
         }
     }
-- 
2.45.2