From a75b6e512a1ed6726bea822f9858c14f587708ef Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 28 Nov 2020 00:35:03 +1000 Subject: [PATCH] System: Improve translatability of save state error --- src/core/system.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 12aee8c36..d5b82a429 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -951,13 +951,21 @@ bool DoLoadState(ByteStream* state, bool force_software_renderer, bool update_di if (header.magic != SAVE_STATE_MAGIC) return false; - if (header.version < SAVE_STATE_MINIMUM_VERSION || header.version > SAVE_STATE_VERSION) + if (header.version < SAVE_STATE_MINIMUM_VERSION) { g_host_interface->ReportFormattedError( g_host_interface->TranslateString("System", - "Save state is incompatible: %s version is %u but state is version %u."), - header.version > SAVE_STATE_VERSION ? "maximum" : "minimum", - header.version > SAVE_STATE_VERSION ? SAVE_STATE_VERSION : SAVE_STATE_MINIMUM_VERSION, header.version); + "Save state is incompatible: minimum version is %u but state is version %u."), + SAVE_STATE_MINIMUM_VERSION, header.version); + return false; + } + + if (header.version > SAVE_STATE_VERSION) + { + g_host_interface->ReportFormattedError( + g_host_interface->TranslateString("System", + "Save state is incompatible: maximum version is %u but state is version %u."), + SAVE_STATE_VERSION, header.version); return false; }