From 0e923ea0eebbf3475ae0e465a0918812b50349d8 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Thu, 4 May 2017 18:12:44 -0700 Subject: [PATCH] Do not auto disconnect all controllers when opening options form when DInput only mode is enabled. --- DS4Windows/DS4Forms/Options.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs index 5a035e2..9f1ee7f 100644 --- a/DS4Windows/DS4Forms/Options.cs +++ b/DS4Windows/DS4Forms/Options.cs @@ -2008,7 +2008,7 @@ namespace DS4Windows private void cBDinput_CheckedChanged(object sender, EventArgs e) { DinputOnly[device] = cBDinput.Checked; - if (device < 4) + if (!loading && device < 4) { root.btnStartStop_Clicked(false); root.btnStartStop_Clicked(false); @@ -2049,7 +2049,6 @@ namespace DS4Windows case "btnFlashColor": root.lbLastMessage.Text = Properties.Resources.FlashAtTip; break; case "cbStartTouchpadOff": root.lbLastMessage.Text = Properties.Resources.TouchpadOffTip; break; case "cBTPforControls": root.lbLastMessage.Text = Properties.Resources.UsingTPSwipes; break; - default: root.lbLastMessage.Text = Properties.Resources.HoverOverItems; break; case "bnUp": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; case "bnLeft": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; @@ -2070,9 +2069,10 @@ namespace DS4Windows case "bnSwipeUp": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; case "bnSwipeLeft": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; case "bnSwipeRight": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; - case "bnSwipeDown": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; - case "bnL3": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; - case "bnR3": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; + case "bnSwipeDown": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; + case "bnL3": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; + case "bnR3": root.lbLastMessage.Text = Properties.Resources.RightClickPresets; break; + default: root.lbLastMessage.Text = Properties.Resources.HoverOverItems; break; } if (name.Contains("bnLS") || name.Contains("bnRS"))