@@ -2010,25 +2010,34 @@ bool VMManager::LoadStateFromSlot(s32 slot, bool backup, Error* error)
20102010 const std::string filename = GetCurrentSaveStateFileName (slot, backup);
20112011 if (filename.empty () || !FileSystem::FileExists (filename.c_str ()))
20122012 {
2013- Host::AddIconOSDMessage (" LoadStateFromSlot" , ICON_FA_TRIANGLE_EXCLAMATION,
2014- fmt::format (TRANSLATE_FS (" VMManager" , " There is no saved {} in slot {}." ), backup ? TRANSLATE (" VMManager" , " backup state" ) : " state" , slot),
2015- Host::OSD_QUICK_DURATION);
2013+ if (backup)
2014+ Error::SetStringFmt (error,
2015+ TRANSLATE_FS (" VMManager" , " There is no save state in backup slot {}." ), slot);
2016+ else
2017+ Error::SetStringFmt (error,
2018+ TRANSLATE_FS (" VMManager" , " There is no save state in slot {}." ), slot);
20162019 return false ;
20172020 }
20182021
20192022 if (Achievements::IsHardcoreModeActive ())
20202023 {
2021- Host::AddIconOSDMessage (" LoadStateHardcoreBlocked" , ICON_FA_TRIANGLE_EXCLAMATION,
2022- fmt::format (TRANSLATE_FS (" VMManager" , " Cannot load save {} from slot {} while RetroAchievements Hardcore Mode is active." ), backup ? TRANSLATE (" VMManager" , " backup state" ) : TRANSLATE (" VMManager" , " state" ), slot),
2023- Host::OSD_WARNING_DURATION);
2024+ if (backup)
2025+ Error::SetStringFmt (error,
2026+ TRANSLATE_FS (" VMManager" , " Cannot load save state from backup slot {} while RetroAchievements Hardcore Mode is active." ), slot);
2027+ else
2028+ Error::SetStringFmt (error,
2029+ TRANSLATE_FS (" VMManager" , " Cannot load save state from slot {} while RetroAchievements Hardcore Mode is active." ), slot);
20242030 return false ;
20252031 }
20262032
20272033 if (MemcardBusy::IsBusy ())
20282034 {
2029- Host::AddIconOSDMessage (" LoadStateFromSlot" , ICON_FA_TRIANGLE_EXCLAMATION,
2030- fmt::format (TRANSLATE_FS (" VMManager" , " Failed to load {} from slot {} (Memory card is busy)" ), backup ? TRANSLATE (" VMManager" , " backup state" ) : TRANSLATE (" VMManager" , " state" ), slot),
2031- Host::OSD_QUICK_DURATION);
2035+ if (backup)
2036+ Error::SetStringFmt (error,
2037+ TRANSLATE_FS (" VMManager" , " Failed to load save state from backup slot {} (memory card is busy)." ), slot);
2038+ else
2039+ Error::SetStringFmt (error,
2040+ TRANSLATE_FS (" VMManager" , " Failed to load save state from slot {} (memory card is busy)." ), slot);
20322041 return false ;
20332042 }
20342043
0 commit comments