Merge with default
This commit is contained in:
commit
b1f953c2a1
1 changed files with 2 additions and 1 deletions
|
@ -1271,7 +1271,8 @@ void CObjectViewer::go ()
|
||||||
// Calc FPS
|
// Calc FPS
|
||||||
static sint64 lastTime=NLMISC::CTime::getPerformanceTime ();
|
static sint64 lastTime=NLMISC::CTime::getPerformanceTime ();
|
||||||
sint64 newTime=NLMISC::CTime::getPerformanceTime ();
|
sint64 newTime=NLMISC::CTime::getPerformanceTime ();
|
||||||
float fps = (float)(1.0 / NLMISC::CTime::ticksToSecond (newTime-lastTime));
|
sint64 timeDiff = newTime - lastTime;
|
||||||
|
float fps = timeDiff > 0 ? (float)(1.0 / NLMISC::CTime::ticksToSecond (newTime-lastTime)) : 1000.0f;
|
||||||
lastTime=newTime;
|
lastTime=newTime;
|
||||||
char msgBar[1024];
|
char msgBar[1024];
|
||||||
uint nbPlayingSources, nbSources;
|
uint nbPlayingSources, nbSources;
|
||||||
|
|
Loading…
Reference in a new issue