The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-22 17:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash when changing profiles via context menu

Browse Source
This commit is contained in:
jays2kings 2014-04-29 20:58:18 -04:00
parent 794cefe2e6
commit 335a411230
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DS4Tool/ScpForm.cs
View File

@ -250,11 +250,11 @@ namespace ScpServer
cbs[Index].Enabled = true; cbs[Index].Enabled = true;
ebns[Index].Enabled = true; ebns[Index].Enabled = true;
dbns[Index].Enabled = true; dbns[Index].Enabled = true;
protexts[Index].Enabled = true; protexts[Index].Enabled = true;
shortcuts[Index].Enabled = true; shortcuts[Index].Enabled = true;
// As above // As above
//if (checkFirst && (Pads[Index].Checked && Index != 0)) //if (checkFirst && (Pads[Index].Checked && Index != 0))
// checkFirst = false; // checkFirst = false;
} }
else else
{ {
@ -269,7 +269,7 @@ namespace ScpServer
shortcuts[Index].Enabled = false; shortcuts[Index].Enabled = false;
// As above // As above
//if (Index == 0) //if (Index == 0)
// checkFirst = false; // checkFirst = false;
} }
tooltip += "\n[" + (Index + 1) + "] " + rootHub.getShortDS4ControllerInfo(Index); // Carefully stay under the 63 character limit. tooltip += "\n[" + (Index + 1) + "] " + rootHub.getShortDS4ControllerInfo(Index); // Carefully stay under the 63 character limit.
} }
@ -277,7 +277,7 @@ namespace ScpServer
// As above // As above
//if (checkFirst && btnClear.Enabled) //if (checkFirst && btnClear.Enabled)
// Pads[0].Checked = true; // Pads[0].Checked = true;
notifyIcon1.Text = tooltip; notifyIcon1.Text = tooltip;
} }
protected void On_Debug(object sender, DS4Control.DebugEventArgs e) protected void On_Debug(object sender, DS4Control.DebugEventArgs e)
@ -382,7 +382,7 @@ namespace ScpServer
private void lvDebug_ItemActivate(object sender, EventArgs e) private void lvDebug_ItemActivate(object sender, EventArgs e)
{ {
MessageBox.Show(((ListView)sender).FocusedItem.SubItems[1].Text,"Log"); MessageBox.Show(((ListView)sender).FocusedItem.SubItems[1].Text, "Log");
} }
private void Profile_Changed(object sender, EventArgs e) private void Profile_Changed(object sender, EventArgs e)
@ -395,7 +395,7 @@ namespace ScpServer
{ {
for (int i = 0; i < shortcuts[tdevice].DropDownItems.Count; i++) for (int i = 0; i < shortcuts[tdevice].DropDownItems.Count; i++)
if (!(shortcuts[tdevice].DropDownItems[i] is ToolStripSeparator)) if (!(shortcuts[tdevice].DropDownItems[i] is ToolStripSeparator))
((ToolStripMenuItem)shortcuts[tdevice].DropDownItems[i]).Checked = false; ((ToolStripMenuItem)shortcuts[tdevice].DropDownItems[i]).Checked = false;
((ToolStripMenuItem)shortcuts[tdevice].DropDownItems[cb.SelectedIndex]).Checked = true; ((ToolStripMenuItem)shortcuts[tdevice].DropDownItems[cb.SelectedIndex]).Checked = true;
Global.setAProfile(tdevice, cb.Items[cb.SelectedIndex].ToString()); Global.setAProfile(tdevice, cb.Items[cb.SelectedIndex].ToString());
Global.Save(); Global.Save();
@ -445,7 +445,8 @@ namespace ScpServer
else else
{ {
for (int i = 0; i < tS.DropDownItems.Count; i++) for (int i = 0; i < tS.DropDownItems.Count; i++)
((ToolStripMenuItem)tS.DropDownItems[i]).Checked = false; if (!(shortcuts[tdevice].DropDownItems[i] is ToolStripSeparator))
((ToolStripMenuItem)tS.DropDownItems[i]).Checked = false;
((ToolStripMenuItem)e.ClickedItem).Checked = true; ((ToolStripMenuItem)e.ClickedItem).Checked = true;
cbs[tdevice].SelectedIndex = tS.DropDownItems.IndexOf(e.ClickedItem); cbs[tdevice].SelectedIndex = tS.DropDownItems.IndexOf(e.ClickedItem);
Global.setAProfile(tdevice, e.ClickedItem.Text); Global.setAProfile(tdevice, e.ClickedItem.Text);
@ -475,7 +476,7 @@ namespace ScpServer
private void openToolStripMenuItem_Click(object sender, EventArgs e) private void openToolStripMenuItem_Click(object sender, EventArgs e)
{ {
notifyIcon_Click(sender,e); notifyIcon_Click(sender, e);
} }
private void notifyIcon_Click(object sender, EventArgs e) private void notifyIcon_Click(object sender, EventArgs e)
@ -487,7 +488,7 @@ namespace ScpServer
private void ScpForm_Move(object sender, EventArgs e) private void ScpForm_Move(object sender, EventArgs e)
{ {
} }
} }
@ -515,4 +516,3 @@ namespace ScpServer
} }
} }
} }