ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1524: Broken speed display 

Before updating the status bar ensure that the user enabled speed display in the UI
This commit is contained in:
oddMLan 2019-01-15 01:10:11 -07:00
parent fff7bb5793
commit 2f868d5e4c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64-core/N64System/FramePerSecondClass.cpp
View File

@ -61,9 +61,11 @@ void CFramePerSecond::Reset(bool ClearDisplay)
void CFramePerSecond::UpdateViCounter(void)
{
if (m_iFrameRateType != FR_VIs &&
m_iFrameRateType != FR_VIs_DLs &&
m_iFrameRateType != FR_PERCENT)
if (!bDisplayFrameRate())
{
return;
}
if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_VIs_DLs && m_iFrameRateType != FR_PERCENT)
{
return;
}
@ -149,6 +151,10 @@ void CFramePerSecond::ScreenHertzChanged(CFramePerSecond * _this)
void CFramePerSecond::UpdateDlCounter(void)
{
if (!bDisplayFrameRate())
{
return;
}
if (m_iFrameRateType != FR_DLs && m_iFrameRateType != FR_VIs_DLs)
{
return;

3
Source/Project64-core/N64System/FramePerSecondClass.h
View File

@ -10,8 +10,9 @@
****************************************************************************/
#pragma once
#include <Common/HighResTimeStamp.h>
#include "../Settings/N64SystemSettings.h"
class CFramePerSecond
class CFramePerSecond : public CN64SystemSettings
{
public:
CFramePerSecond(void);