X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..88f5a9ba6e8566e06bfbbf812d819566af48cc5b:/src/generic/timer.cpp

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index bffbfa37c0..92b513ef35 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mgl/timer.cpp
+// Name:        src/generic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$
@@ -20,11 +20,14 @@
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 
+#if wxUSE_TIMER
+
 #include "wx/timer.h"
 
-#if wxUSE_TIMER
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
 
-#include "wx/log.h"
 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------
@@ -190,7 +193,11 @@ void wxTimerScheduler::NotifyTimers()
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }
                 else
+                {
                     desc = m_timers;
+                    if (!desc)
+                        break;
+                }
             }
         }
     }