ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-05-11 09:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect against negative Stopwatch values on buggy systems. Fixes issue [#2740}: "OpenTK freeze in GameWindow main loop, and possible fix. (Copied from Development forum)".

Browse source
This commit is contained in:
the_fiddler 2011-11-03 10:34:57 +00:00
parent b73bbd899d
commit 656e18ed00
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/OpenTK/GameWindow.cs
View file

@ -441,7 +441,13 @@ namespace OpenTK
// Cap the maximum time drift to 1 second (e.g. when the process is suspended). // Cap the maximum time drift to 1 second (e.g. when the process is suspended).
double time = update_watch.Elapsed.TotalSeconds; double time = update_watch.Elapsed.TotalSeconds;
if (time <= 0) if (time <= 0)
{
// Protect against negative Stopwatch.Elapsed values.
// See http://connect.microsoft.com/VisualStudio/feedback/details/94083/stopwatch-returns-negative-elapsed-time
update_watch.Reset();
update_watch.Start();
return; return;
}
if (time > 1.0) if (time > 1.0)
time = 1.0; time = 1.0;
@ -451,7 +457,7 @@ namespace OpenTK
next_update -= time; next_update -= time;
update_args.Time = time; update_args.Time = time;
OnUpdateFrameInternal(update_args); OnUpdateFrameInternal(update_args);
time = update_time = update_watch.Elapsed.TotalSeconds - time; time = update_time = Math.Max(update_watch.Elapsed.TotalSeconds, 0) - time;
// Stopwatches are not accurate over long time periods. // Stopwatches are not accurate over long time periods.
// We accumulate the total elapsed time into the time variable // We accumulate the total elapsed time into the time variable
// while reseting the Stopwatch frequently. // while reseting the Stopwatch frequently.
@ -486,13 +492,19 @@ namespace OpenTK
{ {
// Cap the maximum time drift to 1 second (e.g. when the process is suspended). // Cap the maximum time drift to 1 second (e.g. when the process is suspended).
double time = render_watch.Elapsed.TotalSeconds; double time = render_watch.Elapsed.TotalSeconds;
if (time <= 0)
{
// Protect against negative Stopwatch.Elapsed values.
// See http://connect.microsoft.com/VisualStudio/feedback/details/94083/stopwatch-returns-negative-elapsed-time
render_watch.Reset();
render_watch.Start();
return;
}
if (time > 1.0) if (time > 1.0)
time = 1.0; time = 1.0;
if (time <= 0)
return;
double time_left = next_render - time; double time_left = next_render - time;
if (time_left <= 0.0) if (time_left <= 0.0 && time > 0)
{ {
// Schedule next render event. The 1 second cap ensures // Schedule next render event. The 1 second cap ensures
// the process does not appear to hang. // the process does not appear to hang.