From 153b3ed61b9e0b79e4ce6d29351b05c4fa786cb1 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 29 Jul 2017 13:46:45 -0500 Subject: [PATCH] winport (aviout) - fix regressions in multipart naming; fix spurious "avi recording ended" message --- desmume/src/frontend/windows/aviout.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/desmume/src/frontend/windows/aviout.cpp b/desmume/src/frontend/windows/aviout.cpp index 0b242c1f9..761125210 100644 --- a/desmume/src/frontend/windows/aviout.cpp +++ b/desmume/src/frontend/windows/aviout.cpp @@ -373,8 +373,6 @@ bool DRV_AviBegin(const char* fname) { DRV_AviEnd(); - ; - BITMAPINFOHEADER bi; memset(&bi, 0, sizeof(bi)); bi.biSize = 0x28; @@ -430,6 +428,9 @@ bool DRV_AviBegin(const char* fname) strcpy(saved_avi_ext,dot); dot[0]='\0'; } + + avi_segnum = 0; + return 1; } @@ -509,7 +510,7 @@ void DRV_AviEnd() return; // Don't display if we're just starting another segment - if(avi_file->tBytes <= 2097152000) { + if(avi_file->tBytes <= 1800 * 1024 * 1024) { EMU_PrintMessage("AVI recording ended."); driver->AddLine("AVI recording ended."); }