From 252e878b5372f1fe32d0271b9f3f8c7d5c88b7bb Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sat, 29 Aug 2020 01:48:13 +1000
Subject: [PATCH] Disable single-instance mode on Unix so we can drop VB.NET
 dependency

---
 src/BizHawk.Client.EmuHawk/Program.cs               | 2 +-
 src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs
index be4771d6c9..6c5ee3beb9 100644
--- a/src/BizHawk.Client.EmuHawk/Program.cs
+++ b/src/BizHawk.Client.EmuHawk/Program.cs
@@ -208,7 +208,7 @@ namespace BizHawk.Client.EmuHawk
 
 			try
 			{
-				if (GlobalWin.Config.SingleInstanceMode)
+				if (!OSTC.IsUnixHost && GlobalWin.Config.SingleInstanceMode)
 				{
 					try
 					{
diff --git a/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs b/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
index 8568c25144..d7b6461388 100644
--- a/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
+++ b/src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using BizHawk.Client.Common;
+using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -71,6 +72,7 @@ namespace BizHawk.Client.EmuHawk
 			HandleAlternateKeyboardLayoutsCheckBox.Checked = _config.HandleAlternateKeyboardLayouts;
 			NeverAskSaveCheckbox.Checked = _config.SuppressAskSave;
 			SingleInstanceModeCheckbox.Checked = _config.SingleInstanceMode;
+			SingleInstanceModeCheckbox.Enabled = !OSTailoredCode.IsUnixHost;
 
 			BackupSRamCheckbox.Checked = _config.BackupSaveram;
 			AutosaveSRAMCheckbox.Checked = _config.AutosaveSaveRAM;