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
This commit is contained in:
@@ -147,7 +147,6 @@ void wxTimerScheduler::NotifyTimers()
|
|||||||
{
|
{
|
||||||
if ( desc->running && desc->shotTime <= now )
|
if ( desc->running && desc->shotTime <= now )
|
||||||
{
|
{
|
||||||
desc = m_timers;
|
|
||||||
oneShot = desc->timer->IsOneShot();
|
oneShot = desc->timer->IsOneShot();
|
||||||
RemoveTimer(desc);
|
RemoveTimer(desc);
|
||||||
|
|
||||||
@@ -167,6 +166,8 @@ void wxTimerScheduler::NotifyTimers()
|
|||||||
if ( !oneShot )
|
if ( !oneShot )
|
||||||
QueueTimer(desc, now + desc->timer->GetInterval());
|
QueueTimer(desc, now + desc->timer->GetInterval());
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
desc = m_timers;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user