From f9d8733604bf9aecd9d0ca8628a799c47ae25acd Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Sun, 2 Feb 2020 11:07:32 +0100
Subject: [PATCH] reios: fix regression due to non-zero GDROM sense codes at
 startup

---
 core/imgread/common.cpp | 8 +++++++-
 core/nullDC.cpp         | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/imgread/common.cpp b/core/imgread/common.cpp
index 09910c2c3..dc607b91c 100644
--- a/core/imgread/common.cpp
+++ b/core/imgread/common.cpp
@@ -155,7 +155,13 @@ bool InitDrive_(char* fn)
 
 bool InitDrive()
 {
-	return DiscSwap();
+	bool rc = DiscSwap();
+	// not needed at startup and confuses some games
+	sns_asc = 0;
+	sns_ascq = 0;
+	sns_key = 0;
+
+	return rc;
 }
 
 void DiscOpenLid()
diff --git a/core/nullDC.cpp b/core/nullDC.cpp
index eef52d1d2..52d357804 100755
--- a/core/nullDC.cpp
+++ b/core/nullDC.cpp
@@ -606,7 +606,7 @@ void dc_start_game(const char *path)
 		}
 		else
 		{
-			if (DiscSwap())
+			if (InitDrive())
 				LoadCustom();
 			else
 			{