From 3ab8f006cb04eb456b7d599366bca941a67587c3 Mon Sep 17 00:00:00 2001
From: OV2 <OV2@sessionclan.de>
Date: Wed, 12 Apr 2023 19:34:09 +0200
Subject: [PATCH] win32: fix command line arguments (fixes #840)

---
 win32/wconfig.cpp | 2 +-
 win32/wsnes9x.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp
index 70a09c47..454b21d4 100644
--- a/win32/wconfig.cpp
+++ b/win32/wconfig.cpp
@@ -40,7 +40,7 @@ extern TCHAR multiRomB[MAX_PATH];
 
 void S9xParseArg (char **argv, int &i, int argc)
 {
-	if (strcasecmp (argv [i], "-removeregistrykeys"))
+	if (strcasecmp (argv [i], "-removeregistrykeys") == 0)
 	{
 		S9xWinRemoveRegistryKeys();
 	}
diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 47cec321..78ba05bd 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -7047,6 +7047,9 @@ void SetInfoDlgColor(unsigned char r, unsigned char g, unsigned char b)
 void S9xWinRemoveRegistryKeys() {
 	TCHAR szRegKey[4096] = {};
 
+    if(!valid_ext)
+        LoadExts();
+
 	_stprintf_s(szRegKey, 4095, TEXT("Software\\Classes\\%s"), SNES9XWPROGID);
 	SHDeleteKey(HKEY_CURRENT_USER, szRegKey);
 	_stprintf_s(szRegKey, 4095, TEXT("Software\\RegisteredApplications\\%s"), SNES9XWPROGID);