Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where the screensaver would start when it shouldn't.

Browse source 
Also changed so that the screensaver is reactivated after scraping only after the user has confirmed the scraping results.
This commit is contained in:
Leon Styhre 2020-08-07 13:07:36 +02:00
parent 004d9dfa9d
commit 11727a1392
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
es-app/src/guis/GuiScraperMulti.cpp
View file

@ -167,18 +167,19 @@ void GuiScraperMulti::finish()
ss << "NO GAMES WERE SCRAPED";
}
else {
ss << mTotalSuccessful << " GAME" << ((mTotalSuccessful > 1) ? "S" : "") <<
" SUCCESSFULLY SCRAPED";
ss << mTotalSuccessful << " GAME" <<
((mTotalSuccessful > 1) ? "S" : "") << " SUCCESSFULLY SCRAPED";
if (mTotalSkipped > 0)
ss << "\n" << mTotalSkipped << " GAME" << ((mTotalSkipped > 1) ? "S" : "") <<
" SKIPPED";
ss << "\n" << mTotalSkipped << " GAME"
<< ((mTotalSkipped > 1) ? "S" : "") << " SKIPPED";
}
mWindow->pushGui(new GuiMsgBox(mWindow, getHelpStyle(), ss.str(), "OK", [&] {
delete this; }));
mIsProcessing = false;
delete this;
}));
mIsProcessing = false;
PowerSaver::resume();
}

2
es-core/src/Window.cpp
View file

@ -274,7 +274,7 @@ void Window::render()
if (mTimeSinceLastInput >= screensaverTime && screensaverTime != 0) {
if (mGameLaunchedState)
mTimeSinceLastInput = 0;
else
else if (!isProcessing() && !mScreenSaver->isScreenSaverActive())
startScreenSaver();
}