diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/saga/render.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/saga/render.cpp')
| -rw-r--r-- | engines/saga/render.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp index 1f23a388d0..b932e228ad 100644 --- a/engines/saga/render.cpp +++ b/engines/saga/render.cpp @@ -276,6 +276,9 @@ void Render::fpsTimerCallback(void *refCon) { } void Render::fpsTimer() { + // CHECKME: This is potentially called from a different thread because it is + // called from a timer callback. However, it does not seem to take any + // precautions to avoid race conditions. _fps = _renderedFrameCount; _renderedFrameCount = 0; } |