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

Do not remove auto profiles entries for currently uninstalled apps

Browse Source 
Related to issue #317. 5 hours for such a small change just because
performance went south. .NET stinks.
This commit is contained in:
Travis Nickles 2018-06-23 02:21:48 -05:00
parent 36aa91dca5
commit 284011c913
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
DS4Windows/DS4Forms/WinProgs.cs
View File

@ -25,6 +25,10 @@ namespace DS4Windows
List<string> programpaths = new List<string>(); List<string> programpaths = new List<string>();
List<string> lodsf = new List<string>(); List<string> lodsf = new List<string>();
bool appsloaded = false; bool appsloaded = false;
const string steamCommx86Loc = @"C:\Program Files (x86)\Steam\steamapps\common";
const string steamCommLoc = @"C:\Program Files\Steam\steamapps\common";
const string originx86Loc = @"C:\Program Files (x86)\Origin Games";
const string originLoc = @"C:\Program Files\Origin Games";
public WinProgs(string[] oc, DS4Form main) public WinProgs(string[] oc, DS4Form main)
{ {
@ -44,17 +48,17 @@ namespace DS4Windows
LoadP(); LoadP();
if (Directory.Exists(@"C:\Program Files (x86)\Steam\steamapps\common")) if (Directory.Exists(steamCommx86Loc))
steamgamesdir = @"C:\Program Files (x86)\Steam\steamapps\common"; steamgamesdir = steamCommx86Loc;
else if (Directory.Exists(@"C:\Program Files\Steam\steamapps\common")) else if (Directory.Exists(steamCommLoc))
steamgamesdir = @"C:\Program Files\Steam\steamapps\common"; steamgamesdir = steamCommLoc;
else else
cMSPrograms.Items.Remove(addSteamGamesToolStripMenuItem); cMSPrograms.Items.Remove(addSteamGamesToolStripMenuItem);
if (Directory.Exists(@"C:\Program Files (x86)\Origin Games")) if (Directory.Exists(originx86Loc))
origingamesdir = @"C:\Program Files (x86)\Origin Games"; origingamesdir = originx86Loc;
else if (Directory.Exists(@"C:\Program Files\Origin Games")) else if (Directory.Exists(originLoc))
origingamesdir = @"C:\Program Files\Origin Games"; origingamesdir = originLoc;
else else
cMSPrograms.Items.Remove(addOriginGamesToolStripMenuItem); cMSPrograms.Items.Remove(addOriginGamesToolStripMenuItem);
} }
@ -105,26 +109,26 @@ namespace DS4Windows
programpaths.Add(x.Attributes["path"].Value); programpaths.Add(x.Attributes["path"].Value);
lVPrograms.BeginUpdate(); lVPrograms.BeginUpdate();
int index = 0;
foreach (string st in programpaths) foreach (string st in programpaths)
{ {
if (File.Exists(st)) if (!string.IsNullOrEmpty(st))
{ {
int index = programpaths.IndexOf(st); if (File.Exists(st))
if (string.Empty != st)
{ {
iLIcons.Images.Add(Icon.ExtractAssociatedIcon(st)); iLIcons.Images.Add(Icon.ExtractAssociatedIcon(st));
ListViewItem lvi = new ListViewItem(Path.GetFileNameWithoutExtension(st), index);
lvi.SubItems.Add(st);
lvi.Checked = true;
lvi.ToolTipText = st;
lVPrograms.Items.Add(lvi);
} }
ListViewItem lvi = new ListViewItem(Path.GetFileNameWithoutExtension(st), index);
lvi.Checked = true;
lvi.ToolTipText = st;
lvi.SubItems.Add(st);
lVPrograms.Items.Add(lvi);
} }
else
{ index++;
RemoveP(st, false, false);
}
} }
lVPrograms.EndUpdate(); lVPrograms.EndUpdate();
} }
@ -172,7 +176,7 @@ namespace DS4Windows
appsloaded = true; appsloaded = true;
} }
void addLoadedApps() void AddLoadedApps()
{ {
if (appsloaded) if (appsloaded)
{ {
@ -298,7 +302,7 @@ namespace DS4Windows
} }
} }
public void RemoveP(string name, bool uncheck, bool reload = true) public void RemoveP(string name, bool uncheck)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.Load(m_Profile); doc.Load(m_Profile);
@ -316,8 +320,6 @@ namespace DS4Windows
cbs[i].SelectedIndex = cbs[i].Items.Count - 1; cbs[i].SelectedIndex = cbs[i].Items.Count - 1;
bnSave.Enabled = false; bnSave.Enabled = false;
if (reload)
form.LoadP();
} }
private void CBProfile_IndexChanged(object sender, EventArgs e) private void CBProfile_IndexChanged(object sender, EventArgs e)
@ -388,7 +390,7 @@ namespace DS4Windows
bnAddPrograms.Enabled = false; bnAddPrograms.Enabled = false;
cMSPrograms.Items.Remove(addSteamGamesToolStripMenuItem); cMSPrograms.Items.Remove(addSteamGamesToolStripMenuItem);
await Task.Run(() => GetApps(steamgamesdir)); await Task.Run(() => GetApps(steamgamesdir));
addLoadedApps(); AddLoadedApps();
} }
private async void addDirectoryToolStripMenuItem_Click(object sender, EventArgs e) private async void addDirectoryToolStripMenuItem_Click(object sender, EventArgs e)
@ -399,7 +401,7 @@ namespace DS4Windows
bnAddPrograms.Text = Properties.Resources.Loading; bnAddPrograms.Text = Properties.Resources.Loading;
bnAddPrograms.Enabled = false; bnAddPrograms.Enabled = false;
await Task.Run(() => GetApps(fbd.SelectedPath)); await Task.Run(() => GetApps(fbd.SelectedPath));
addLoadedApps(); AddLoadedApps();
} }
} }
@ -427,7 +429,7 @@ namespace DS4Windows
bnAddPrograms.Enabled = false; bnAddPrograms.Enabled = false;
cMSPrograms.Items.Remove(addOriginGamesToolStripMenuItem); cMSPrograms.Items.Remove(addOriginGamesToolStripMenuItem);
await Task.Run(() => GetApps(origingamesdir)); await Task.Run(() => GetApps(origingamesdir));
addLoadedApps(); AddLoadedApps();
} }
private async void addProgramsFromStartMenuToolStripMenuItem_Click(object sender, EventArgs e) private async void addProgramsFromStartMenuToolStripMenuItem_Click(object sender, EventArgs e)
@ -436,7 +438,7 @@ namespace DS4Windows
bnAddPrograms.Enabled = false; bnAddPrograms.Enabled = false;
cMSPrograms.Items.Remove(addProgramsFromStartMenuToolStripMenuItem); cMSPrograms.Items.Remove(addProgramsFromStartMenuToolStripMenuItem);
await Task.Run(() => GetShortcuts(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu) + "\\Programs")); await Task.Run(() => GetShortcuts(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu) + "\\Programs"));
addLoadedApps(); AddLoadedApps();
} }
public static string GetTargetPath(string filePath) public static string GetTargetPath(string filePath)