diff --git a/Core/AVIDump.cpp b/Core/AVIDump.cpp index 37c6cd620a1e..c4dd316c01fc 100644 --- a/Core/AVIDump.cpp +++ b/Core/AVIDump.cpp @@ -169,7 +169,7 @@ static void PreparePacket(AVPacket* pkt) { void AVIDump::AddFrame() { - gpuDebug->GetCurrentFramebuffer(buf, GPU_DBG_FRAMEBUF_DISPLAY); + gpuDebug->GetOutputFramebuffer(buf); u32 w = buf.GetStride(); u32 h = buf.GetHeight(); CheckResolution(w, h); diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index d47daf3e4d30..7417d3eee4f1 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -107,7 +107,7 @@ static void __EmuScreenVblank() if (g_Config.bDumpFrames && !startDumping) { avi.Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight); - osm.Show(sy->T("AVI Dump started."), 3.0f); + osm.Show(sy->T("AVI Dump started."), 0.5f); startDumping = true; } if (g_Config.bDumpFrames && startDumping) @@ -117,7 +117,7 @@ static void __EmuScreenVblank() else if (!g_Config.bDumpFrames && startDumping) { avi.Stop(); - osm.Show(sy->T("AVI Dump stopped."), 3.0f); + osm.Show(sy->T("AVI Dump stopped."), 1.0f); startDumping = false; } #endif @@ -347,7 +347,7 @@ EmuScreen::~EmuScreen() { if (g_Config.bDumpFrames && startDumping) { avi.Stop(); - osm.Show("AVI Dump stopped.", 3.0f); + osm.Show("AVI Dump stopped.", 1.0f); startDumping = false; } #endif @@ -371,7 +371,7 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) { } static void AfterSaveStateAction(SaveState::Status status, const std::string &message, void *) { - if (!message.empty()) { + if (!message.empty() && !g_Config.bDumpFrames) { osm.Show(message, status == SaveState::Status::SUCCESS ? 2.0 : 5.0); } } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 841b3d9acf8d..0c99c285ecb5 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -676,7 +676,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch if (!boot_filename.empty() && stateToLoad != NULL) { SaveState::Load(stateToLoad, [](SaveState::Status status, const std::string &message, void *) { - if (!message.empty()) { + if (!message.empty() && !g_Config.bDumpFrames) { osm.Show(message, status == SaveState::Status::SUCCESS ? 2.0 : 5.0); } }); diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 17a206fe8a6c..7337a708967f 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -271,7 +271,7 @@ void SaveSlotView::Draw(UIContext &dc) { } static void AfterSaveStateAction(SaveState::Status status, const std::string &message, void *) { - if (!message.empty()) { + if (!message.empty() && !g_Config.bDumpFrames) { osm.Show(message, status == SaveState::Status::SUCCESS ? 2.0 : 5.0); } } diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 649f4c0c3a58..4edab37403e7 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -470,7 +470,7 @@ namespace MainWindow { } static void SaveStateActionFinished(SaveState::Status status, const std::string &message, void *userdata) { - if (!message.empty()) { + if (!message.empty() && !g_Config.bDumpFrames) { osm.Show(message, status == SaveState::Status::SUCCESS ? 2.0 : 5.0); } PostMessage(MainWindow::GetHWND(), WM_USER_SAVESTATE_FINISH, 0, 0);