mirror of
https://github.com/EpicMorg/UniversalValveToolbox.git
synced 2025-01-28 22:48:09 +03:00
null engine folder fix
This commit is contained in:
parent
52080a85b7
commit
e1cf1fa387
@ -26,7 +26,14 @@ namespace UniversalValveToolbox {
|
|||||||
private ListViewGroup listViewGroupAddons;
|
private ListViewGroup listViewGroupAddons;
|
||||||
private ListViewGroup listViewGroupTools;
|
private ListViewGroup listViewGroupTools;
|
||||||
|
|
||||||
private EngineDtoModel SelectedEngine { get => Engines[comboBoxEngine.SelectedIndex]; }
|
private EngineDtoModel SelectedEngine {
|
||||||
|
get {
|
||||||
|
if (Engines.Length == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return Engines[comboBoxEngine.SelectedIndex];
|
||||||
|
}
|
||||||
|
}
|
||||||
private ProjectDtoModel SelectedProject {
|
private ProjectDtoModel SelectedProject {
|
||||||
get => (ProjectDtoModel)((comboBoxProjects.Enabled)
|
get => (ProjectDtoModel)((comboBoxProjects.Enabled)
|
||||||
? Projects.First(project => project.Name.Equals(comboBoxProjects.SelectedItem))
|
? Projects.First(project => project.Name.Equals(comboBoxProjects.SelectedItem))
|
||||||
@ -55,7 +62,7 @@ namespace UniversalValveToolbox {
|
|||||||
private void UpdateLastSelectedProject() {
|
private void UpdateLastSelectedProject() {
|
||||||
var lastSelectedProject = dataProvider.Projects.FirstOrDefault(project => project.Name.Equals(dataProvider.Settings.LastSelectedProject));
|
var lastSelectedProject = dataProvider.Projects.FirstOrDefault(project => project.Name.Equals(dataProvider.Settings.LastSelectedProject));
|
||||||
|
|
||||||
if (lastSelectedProject != null) {
|
if (lastSelectedProject != null && Engines.Length != 0) {
|
||||||
var indexEngine = comboBoxEngine.Items.IndexOf(Engines.First(engine => engine.Appid.Equals(lastSelectedProject.Engine)).Name);
|
var indexEngine = comboBoxEngine.Items.IndexOf(Engines.First(engine => engine.Appid.Equals(lastSelectedProject.Engine)).Name);
|
||||||
comboBoxEngine.SelectedIndex = indexEngine;
|
comboBoxEngine.SelectedIndex = indexEngine;
|
||||||
|
|
||||||
@ -169,6 +176,14 @@ namespace UniversalValveToolbox {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateProjectList() {
|
private void UpdateProjectList() {
|
||||||
|
if (Engines.Length == 0) {
|
||||||
|
comboBoxProjects.Enabled = false;
|
||||||
|
|
||||||
|
comboBoxProjects.Items.Clear();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Projects = dataProvider.Projects;
|
Projects = dataProvider.Projects;
|
||||||
|
|
||||||
var selectEngine = Engines[comboBoxEngine.SelectedIndex];
|
var selectEngine = Engines[comboBoxEngine.SelectedIndex];
|
||||||
@ -190,8 +205,6 @@ namespace UniversalValveToolbox {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateToolsList() {
|
private void UpdateToolsList() {
|
||||||
var pathSelectedEngine = SteamPathsUtil.GetSteamAppManifestDataById(SelectedEngine.Appid)?.Path;
|
|
||||||
|
|
||||||
var removeItem = new List<ListViewItem>();
|
var removeItem = new List<ListViewItem>();
|
||||||
|
|
||||||
foreach (ListViewItem item in listViewGroupTools.Items) {
|
foreach (ListViewItem item in listViewGroupTools.Items) {
|
||||||
@ -200,6 +213,11 @@ namespace UniversalValveToolbox {
|
|||||||
|
|
||||||
removeItem.ForEach(item => listView.Items.Remove(item));
|
removeItem.ForEach(item => listView.Items.Remove(item));
|
||||||
|
|
||||||
|
if (SelectedEngine == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var pathSelectedEngine = SteamPathsUtil.GetSteamAppManifestDataById(SelectedEngine.Appid)?.Path;
|
||||||
|
|
||||||
if (pathSelectedEngine != null) {
|
if (pathSelectedEngine != null) {
|
||||||
var pairPathIconTools = SelectedEngine.Tools
|
var pairPathIconTools = SelectedEngine.Tools
|
||||||
.Where(tool => File.Exists(Path.Combine(pathSelectedEngine, tool.Bin)))
|
.Where(tool => File.Exists(Path.Combine(pathSelectedEngine, tool.Bin)))
|
||||||
@ -254,9 +272,6 @@ namespace UniversalValveToolbox {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateAddonsList() {
|
private void UpdateAddonsList() {
|
||||||
var pathSelectedEngine = SteamPathsUtil.GetSteamAppManifestDataById(SelectedEngine.Appid)?.Path;
|
|
||||||
var addonsSelectedEngine = dataProvider.Addons.Where(a => a.Engines.Contains(SelectedEngine.Appid));
|
|
||||||
|
|
||||||
var removeItem = new List<ListViewItem>();
|
var removeItem = new List<ListViewItem>();
|
||||||
|
|
||||||
foreach (ListViewItem item in listViewGroupAddons.Items) {
|
foreach (ListViewItem item in listViewGroupAddons.Items) {
|
||||||
@ -265,6 +280,12 @@ namespace UniversalValveToolbox {
|
|||||||
|
|
||||||
removeItem.ForEach(item => listView.Items.Remove(item));
|
removeItem.ForEach(item => listView.Items.Remove(item));
|
||||||
|
|
||||||
|
if (SelectedEngine == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var pathSelectedEngine = SteamPathsUtil.GetSteamAppManifestDataById(SelectedEngine.Appid)?.Path;
|
||||||
|
var addonsSelectedEngine = dataProvider.Addons.Where(a => a.Engines.Contains(SelectedEngine.Appid));
|
||||||
|
|
||||||
|
|
||||||
var pairPathIconTools = addonsSelectedEngine
|
var pairPathIconTools = addonsSelectedEngine
|
||||||
.Where(addon => {
|
.Where(addon => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user