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

mGUI: Fix FPS counter after closing menu

This commit is contained in:
Vicki Pfau 2022-02-27 21:17:06 -08:00
parent 65baf03353
commit b955933427
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -10,6 +10,7 @@ Other fixes:
- FFmpeg: Fix crash when encoding audio with some containers
- FFmpeg: Fix GIF recording (fixes mgba.io/i/2393)
- GB, GBA: Save writeback-pending masked saves on unload (fixes mgba.io/i/2396)
- mGUI: Fix FPS counter after closing menu
- VFS: Failed file mapping should return NULL on POSIX
Misc:
- Qt: Enable -b for Boot BIOS menu option (fixes mgba.io/i/2074)

13
src/feature/gui/gui-runner.c
View File

@ -24,8 +24,8 @@ mLOG_DECLARE_CATEGORY(GUI_RUNNER);
mLOG_DEFINE_CATEGORY(GUI_RUNNER, "GUI Runner", "gui.runner");
#define AUTOSAVE_GRANULARITY 600
#define FPS_GRANULARITY 120
#define FPS_BUFFER_SIZE 3
#define FPS_GRANULARITY 30
#define FPS_BUFFER_SIZE 4
enum {
RUNNER_CONTINUE = 1,
@ -477,10 +477,10 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
runner->gameLoaded(runner);
}
mLOG(GUI_RUNNER, INFO, "Game starting");
runner->fps = 0;
while (running) {
CircleBufferClear(&runner->fpsBuffer);
runner->totalDelta = 0;
runner->fps = 0;
struct timeval tv;
gettimeofday(&tv, 0);
runner->lastFpsCheck = 1000000LL * tv.tv_sec + tv.tv_usec;
@ -567,7 +567,8 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
}
runner->params.drawEnd();
if (runner->core->frameCounter(runner->core) % FPS_GRANULARITY == 0) {
++frame;
if (frame % FPS_GRANULARITY == 0) {
if (drawFps) {
struct timeval tv;
gettimeofday(&tv, 0);
@ -592,7 +593,9 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
frame = 0;
_tryAutosave(runner);
}
++frame;
if (frame == FPS_GRANULARITY * AUTOSAVE_GRANULARITY) {
frame = 0;
}
}
}
if (!running) {