From 0a44124c20ede1de2c0406e78c99fb91edb2eb80 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Mon, 1 Jun 2026 22:30:31 +0200
Subject: [PATCH] process savestates on swap buffer (#1003)

---
 src/device/rdp.rs | 3 +--
 src/device/vi.rs  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/device/rdp.rs b/src/device/rdp.rs
index 3d115f8..fcccb69 100644
--- a/src/device/rdp.rs
+++ b/src/device/rdp.rs
@@ -1,4 +1,4 @@
-use crate::{device, savestates, ui};
+use crate::{device, ui};
 
 pub const DPC_START_REG: usize = 0;
 pub const DPC_END_REG: usize = 1;
@@ -120,7 +120,6 @@ fn run_rdp(device: &mut device::Device) {
     device.rdp.regs_dpc[DPC_PIPEBUSY_REG] = 0xFFFFFF;
 
     if timer != 0 {
-        savestates::process_savestates(device);
         device::events::create_event(device, device::events::EVENT_TYPE_DP, timer)
     }
 }
diff --git a/src/device/vi.rs b/src/device/vi.rs
index f0d8fc4..f33c30d 100644
--- a/src/device/vi.rs
+++ b/src/device/vi.rs
@@ -1,4 +1,4 @@
-use crate::{cheats, device, netplay, retroachievements, ui};
+use crate::{cheats, device, netplay, retroachievements, savestates, ui};
 
 const VI_STATUS_REG: usize = 0;
 const VI_ORIGIN_REG: usize = 1;
@@ -110,6 +110,7 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
             let current_origin = device.vi.regs[reg as usize];
             device::memory::masked_write_32(&mut device.vi.regs[reg as usize], value, mask);
             if current_origin != device.vi.regs[reg as usize] {
+                savestates::process_savestates(device);
                 let _ = device.ui.video.fps_tx.as_ref().unwrap().try_send(true);
             }
         }