From 8bb117e4de94b744b76453c9c4eed1b795def2fd Mon Sep 17 00:00:00 2001
From: LuigiBlood <luigiblood@gmail.com>
Date: Wed, 10 Jun 2020 15:30:06 +0200
Subject: [PATCH] [Save State] Recover Disk Seek Address when loading from Zip

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

diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp
index 9b395144d..cc9bf43ed 100644
--- a/Source/Project64-core/N64System/N64Class.cpp
+++ b/Source/Project64-core/N64System/N64Class.cpp
@@ -2047,6 +2047,11 @@ bool CN64System::LoadState(const char * FileName)
                 //Extra Info v2 (Project64 2.4)
                 //Disk Interface Info
                 unzReadCurrentFile(file, 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(file);
             }