Merge pull request #8919 from unknownbrackets/ui-tweaks

UI: Suppress state slot switch preview during boot
This commit is contained in:
Henrik Rydgård 2016-08-21 11:08:14 +02:00 committed by GitHub
commit 028e98a92c

View File

@ -202,6 +202,8 @@ void EmuScreen::bootComplete() {
}
System_SendMessage("event", "startgame");
saveStateSlot_ = SaveState::GetCurrentSlot();
}
EmuScreen::~EmuScreen() {
@ -804,7 +806,7 @@ void EmuScreen::update(InputState &input) {
screenManager()->push(new GamePauseScreen(gamePath_));
}
if (saveStatePreview_) {
if (saveStatePreview_ && !bootPending_) {
int currentSlot = SaveState::GetCurrentSlot();
if (saveStateSlot_ != currentSlot) {
saveStateSlot_ = currentSlot;