Fix savestates from before 1.4.2-420. Fixes #9998. Unfortunately this…

… also breaks states between 420 and 468, so please save normally before upgrading if you were using one of those.
hrydgard · Oct 4, 2017 · 709a86a · 709a86a
1 parent 356b25e
commit 709a86a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
@@ -263,7 +263,6 @@ void __KernelDoState(PointerWrap &p)
 		__UmdDoState(p);
 		__UtilityDoState(p);
 		__UsbDoState(p);
-		__UsbGpsDoState(p);
 		__VaudioDoState(p);
 		__HeapDoState(p);
 
@@ -272,6 +271,9 @@ void __KernelDoState(PointerWrap &p)
 		__sceAudiocodecDoState(p);
 		__VideoPmpDoState(p);
 		__AACDoState(p);
+		__UsbGpsDoState(p);
+
+		// IMPORTANT! Add new sections last!
 	}
 
 	{

diff --git a/Core/HLE/sceUsbGps.cpp b/Core/HLE/sceUsbGps.cpp
@@ -36,7 +36,7 @@ void __UsbGpsInit() {
 }
 
 void __UsbGpsDoState(PointerWrap &p) {
-	auto s = p.Section("sceUsbGps", 1, 4);
+	auto s = p.Section("sceUsbGps", 0, 1);
 	if (!s)
 		return;