The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-17 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure profiles list is not rendered while options form is open

Browse Source
This commit is contained in:
Travis Nickles 2017-08-24 04:29:08 -05:00
parent 1f4464271e
commit 85479184be
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -1403,7 +1403,9 @@ namespace DS4Windows
private void ShowOptions(int devID, string profile) private void ShowOptions(int devID, string profile)
{ {
Show(); Show();
tabMain.SelectedIndex = 1;
lBProfiles.Visible = false;
WindowState = FormWindowState.Normal; WindowState = FormWindowState.Normal;
toolStrip1.Enabled = false; toolStrip1.Enabled = false;
tSOptions.Visible = true; tSOptions.Visible = true;
@ -1429,11 +1431,16 @@ namespace DS4Windows
opt.Reload(devID, profile); opt.Reload(devID, profile);
opt.inputtimer.Start(); opt.inputtimer.Start();
opt.Visible = true; opt.Visible = true;
tabMain.SelectedIndex = 1;
} }
public void OptionsClosed() public void OptionsClosed()
{ {
RefreshProfiles(); RefreshProfiles();
if (!lbNoControllers.Visible)
tabMain.SelectedIndex = 0;
Size = oldsize; Size = oldsize;
oldsize = new Size(0, 0); oldsize = new Size(0, 0);
tSBKeepSize.Text = Properties.Resources.KeepThisSize; tSBKeepSize.Text = Properties.Resources.KeepThisSize;
@ -1449,11 +1456,10 @@ namespace DS4Windows
lbLastMessage.Text = lvDebug.Items[lvDebugItemCount - 1].SubItems[1].Text; lbLastMessage.Text = lvDebug.Items[lvDebugItemCount - 1].SubItems[1].Text;
} }
if (!lbNoControllers.Visible)
tabMain.SelectedIndex = 0;
opt.inputtimer.Stop(); opt.inputtimer.Stop();
opt.sixaxisTimer.Stop(); opt.sixaxisTimer.Stop();
lBProfiles.Visible = true;
} }
private void editButtons_Click(object sender, EventArgs e) private void editButtons_Click(object sender, EventArgs e)