Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed two additional instances where video would start playing when it shouldn't.

Browse source
This commit is contained in:
Leon Styhre 2020-09-27 13:14:50 +02:00
parent 54ea153d93
commit 4e9c1361be
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
USERGUIDE.md
View file

@ -911,7 +911,7 @@ A statistics counter that counts how many times you're played the game. You norm
### Buttons ### Buttons
For game files, there will be four buttons displayed on the bottom of the metadata editor window, and for folders there will be three buttons. These are their functions: For game files, there will be five buttons displayed on the bottom of the metadata editor window, and for folders there will be four. These are their functions:
**Scrape** **Scrape**

7
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -248,8 +248,11 @@ GuiMetaDataEd::GuiMetaDataEd(
buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "SCRAPE", "scrape", buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "SCRAPE", "scrape",
std::bind(&GuiMetaDataEd::fetch, this))); std::bind(&GuiMetaDataEd::fetch, this)));
buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "SAVE", "save metadata", buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "SAVE", "save metadata", [&] {
[&] { save(); delete this; })); save();
ViewController::get()->onPauseVideo();
delete this;
}));
buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "CANCEL", "cancel changes", buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "CANCEL", "cancel changes",
[&] { delete this; })); [&] { delete this; }));

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

@ -604,8 +604,12 @@ bool Window::cancelScreenSaver()
mScreenSaver->resetCounts(); mScreenSaver->resetCounts();
// Tell the GUI components the screensaver has stopped. // Tell the GUI components the screensaver has stopped.
for (auto it = mGuiStack.cbegin(); it != mGuiStack.cend(); it++) for (auto it = mGuiStack.cbegin(); it != mGuiStack.cend(); it++) {
(*it)->onScreenSaverDeactivate(); (*it)->onScreenSaverDeactivate();
// If the menu is open, pause the video so it won't start playing beneath the menu.
if (mGuiStack.front() != mGuiStack.back())
(*it)->onPauseVideo();
}
mSaturationAmount = 1.0; mSaturationAmount = 1.0;
mDimValue = 1.0; mDimValue = 1.0;