From f6fd73fe1cd80a64a612db2a5df50bda4dcbf456 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 16 Dec 2014 10:59:39 +0000
Subject: [PATCH] psx - disc swapping tiny fixes

---
 .../Consoles/Sony/PSX/Octoshock.cs            |   2 +-
 output/dll/octoshock.dll                      | Bin 838144 -> 838144 bytes
 psx/octoshock/psx/psx.cpp                     |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index d5d8910f9b..15aef31673 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -366,7 +366,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 
 			int w = fb.width;
 			int h = fb.height;
-		BufferWidth = w;
+			BufferWidth = w;
 			BufferHeight = h;
 
 			switch (_Settings.ResolutionMode)
diff --git a/output/dll/octoshock.dll b/output/dll/octoshock.dll
index 4cc4ea8a1ff1e273de525b0327ee1b9adb3ca917..30c0f64c9b52155eade1510cd1e43a4a4835d401 100644
GIT binary patch
delta 97
zcmZpeV%#vrcmX5RfBwl#jDAdC!<vH_+k+TEm<foPftUq|S%H`hh}nUd1Bf}d2QhNl
p?q_7&KH&h@mI*-Z+uZ`W%hob3*}nH5_j5j`ul(DW@$y9N0RWg!AG!bl

delta 97
zcmZpeV%#vrcmX4m8t-H#Mn9%3-{v63_8>+OW&&bnAZ7t#Rv=~rVs;?r0AkMVL5y6s
o`xzOwPdLD}Wdcz9cDF$8vbBthx9|PO{hW_UmUsIyUY@8u00G_{lmGw#

diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp
index 20cd933ceb..6d8f8ac71a 100644
--- a/psx/octoshock/psx/psx.cpp
+++ b/psx/octoshock/psx/psx.cpp
@@ -1877,7 +1877,7 @@ EW_EXPORT s32 shock_SetDisc(void* psx, ShockDiscRef* disc)
 	s_CurrDisc = disc;
 
 	//set the disc to the CDC, but since its necessarily open to insert, this is false
-	CDC->SetDisc(false,s_CurrDisc,s_CurrDiscInfo.id);
+	CDC->SetDisc(true,s_CurrDisc,s_CurrDiscInfo.id);
 
 	return SHOCK_OK;
 }