From b583e446e68eafa5a033ede8d0d23e4df20910d8 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 9 Jul 2014 23:30:20 -0700 Subject: [PATCH] Skip reporting savedata stuff in known cases. We were always doing 3 before for 5, so skip reporting it. Other cases are the interesting ones. --- Core/Dialog/SavedataParam.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 58034dd97e..3f14ffeea6 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -610,13 +610,21 @@ void SavedataParam::LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 if (prevCryptMode == 1 && param->key[0] == 0) { // Backwards compat for a bug we used to have. WARN_LOG(SCEUTILITY, "Savedata loading with hashmode %d instead of detected %d", prevCryptMode, decryptMode); - I18NCategory *d = GetI18NCategory("Dialog"); - osm.Show(d->T("When you save, it will load on a PSP, but not an older PPSSPP"), 6.0f); - osm.Show(d->T("Old savedata detected"), 6.0f); hasKey = false; decryptMode = prevCryptMode; + + // Don't notify the user if we're not going to upgrade the save. + if (!g_Config.bEncryptSave) { + I18NCategory *d = GetI18NCategory("Dialog"); + osm.Show(d->T("When you save, it will load on a PSP, but not an older PPSSPP"), 6.0f); + osm.Show(d->T("Old savedata detected"), 6.0f); + } } else { - WARN_LOG_REPORT(SCEUTILITY, "Savedata loading with detected hashmode %d instead of file's %d", decryptMode, prevCryptMode); + if (decryptMode == 5 && prevCryptMode == 3) { + WARN_LOG(SCEUTILITY, "Savedata loading with detected hashmode %d instead of file's %d", decryptMode, prevCryptMode); + } else { + WARN_LOG_REPORT(SCEUTILITY, "Savedata loading with detected hashmode %d instead of file's %d", decryptMode, prevCryptMode); + } } }