From c5c6167f05d7c6d795e6afb46742b5dace26effa Mon Sep 17 00:00:00 2001
From: LuigiBlood <luigiblood@gmail.com>
Date: Wed, 10 Jun 2020 13:58:03 +0200
Subject: [PATCH] [Save State] Recover Disk Seek Address for more stability

---
 Source/Project64-core/N64System/N64Class.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp
index f8585a624..9b395144d 100644
--- a/Source/Project64-core/N64System/N64Class.cpp
+++ b/Source/Project64-core/N64System/N64Class.cpp
@@ -17,6 +17,7 @@
 #include <Project64-core/N64System/Mips/Transferpak.h>
 #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
 #include <Project64-core/N64System/Mips/OpcodeName.h>
+#include <Project64-core/N64System/Mips/Disk.h>
 #include <Project64-core/N64System/N64DiskClass.h>
 #include <Project64-core/ExceptionHandler.h>
 #include <Project64-core/Logging.h>
@@ -2132,8 +2133,14 @@ bool CN64System::LoadState(const char * FileName)
 
             //Disk Interface Info
             if (Value == SaveID_2)
+            {
                 hExtraInfo.Read(m_Reg.m_DiskInterface, sizeof(uint32_t) * 22);
 
+                //Recover Disk Seek Address (if the save state is done while loading/saving data)
+                if (g_Disk)
+                    DiskBMReadWrite(false);
+            }
+
             //System Timers Info
             m_SystemTimer.LoadData(hExtraInfo);