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

Fixed an issue where quitting the application during a ROM rescan could lead to an unclean shutdown

Browse source
This commit is contained in:
Leon Styhre 2023-10-18 17:52:28 +02:00
parent c0a2f9f557
commit 35e7cd0b77
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
es-app/src/guis/GuiMenu.cpp
View file

@ -91,12 +91,14 @@ GuiMenu::GuiMenu()
GuiMenu::~GuiMenu() GuiMenu::~GuiMenu()
{ {
// This is required for the situation where scrolling started just before the menu if (ViewController::getInstance()->getState().viewing != ViewController::ViewMode::NOTHING) {
// was openened. Without this, the scrolling would run until manually stopped after // This is required for the situation where scrolling started just before the menu
// the menu has been closed. // was openened. Without this, the scrolling would run until manually stopped after
ViewController::getInstance()->stopScrolling(); // the menu has been closed.
ViewController::getInstance()->stopScrolling();
ViewController::getInstance()->startViewVideos(); ViewController::getInstance()->startViewVideos();
}
} }
void GuiMenu::openScraperOptions() void GuiMenu::openScraperOptions()

3
es-app/src/views/ViewController.cpp
View file

@ -1409,13 +1409,14 @@ void ViewController::reloadAll()
void ViewController::rescanROMDirectory() void ViewController::rescanROMDirectory()
{ {
mWindow->setBlockInput(true); mWindow->setBlockInput(true);
resetCamera();
mState.viewing = ViewMode::NOTHING;
mGamelistViews.clear(); mGamelistViews.clear();
mSystemListView.reset(); mSystemListView.reset();
mCurrentView.reset(); mCurrentView.reset();
mPreviousView.reset(); mPreviousView.reset();
mSkipView.reset(); mSkipView.reset();
resetCamera();
mWindow->renderSplashScreen(Window::SplashScreenState::SCANNING, 0.0f); mWindow->renderSplashScreen(Window::SplashScreenState::SCANNING, 0.0f);
CollectionSystemsManager::getInstance()->deinit(false); CollectionSystemsManager::getInstance()->deinit(false);