From 1acb7dfa9e43438bed4cb8a0a89dc087977428e2 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 3 Jul 2023 16:08:52 -0700
Subject: [PATCH] Qt: Add exporting of SAV + RTC GB saves from Save Converter
 to strip RTC data

---
 CHANGES                           | 2 +-
 src/platform/qt/SaveConverter.cpp | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a99436c6c..11bf6d60d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,7 @@ Emulation fixes:
 Other fixes:
  - mGUI: Fix cases where an older save state screenshot would be shown (fixes mgba.io/i/2183)
 Misc:
- - Qt: Add exporting of SAV + RTC GBA saves from Save Converter to strip RTC data
+ - Qt: Add exporting of SAV + RTC saves from Save Converter to strip RTC data
 
 0.10.2: (2023-04-23)
 Emulation fixes:
diff --git a/src/platform/qt/SaveConverter.cpp b/src/platform/qt/SaveConverter.cpp
index 1aa93f6fb..fe8fe26fe 100644
--- a/src/platform/qt/SaveConverter.cpp
+++ b/src/platform/qt/SaveConverter.cpp
@@ -623,6 +623,11 @@ QList<SaveConverter::AnnotatedSave> SaveConverter::AnnotatedSave::possibleConver
 			}
 			break;
 		default:
+			if (size & 0xFF) {
+				AnnotatedSave noRtc = same;
+				noRtc.size &= ~0xFF;
+				possible.append(noRtc);
+			}
 			break;
 		}
 		break;
@@ -731,6 +736,9 @@ QByteArray SaveConverter::AnnotatedSave::convertTo(const SaveConverter::Annotate
 			}
 			break;
 		default:
+			if (endianness == target.endianness && size > target.size) {
+				converted = backing->read(target.size);
+			}
 			break;
 		}
 		break;