MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

bugfix: client-list disappears when node.mesh == null

Browse Source
This commit is contained in:
Simon Schön
2022-06-08 18:59:53 +02:00
parent fa884a7e73
commit 756e93a7c7
1 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/MainForm.cs
View File

@@ -556,7 +556,7 @@ namespace MeshCentralRouter
{
string host = serverNameComboBox.Text;
int i = host.IndexOf("?key=");
if (i >= 0) { host = host.Substring(0, i); }
if (i >= 0) { host = host.Substring(0, i); }
i = host.IndexOf(":");
if (i >= 0) { host = host.Substring(0, i); }
ok = (Program.LockToHostname == host);
@@ -737,15 +737,15 @@ namespace MeshCentralRouter
}
}
class GroupComparer : IComparer
{
public int Compare(object objA, object objB)
{
return ((ListViewGroup)objA).Header.CompareTo(((ListViewGroup)objB).Header);
}
}
class GroupComparer : IComparer
{
public int Compare(object objA, object objB)
{
return ((ListViewGroup)objA).Header.CompareTo(((ListViewGroup)objB).Header);
}
}
private void updateDeviceList()
private void updateDeviceList()
{
string search = searchTextBox.Text.ToLower();
if (deviceListViewMode)
@@ -784,42 +784,42 @@ namespace MeshCentralRouter
device.SubItems[0].Text = node.name;
}
// *** Flynn Grouping start
bool bGroupExisting = false;
for(int i = 0; i < devicesListView.Groups.Count; i++)
if(devicesListView.Groups[i].Header == node.mesh.name)
{
bGroupExisting = true;
node.listitem.Group = devicesListView.Groups[i];
break;
}
if(!bGroupExisting)
{
ListViewGroup grp = devicesListView.Groups.Add(devicesListView.Groups.Count.ToString(), node.mesh.name);
node.listitem.Group = grp;
// *** Flynn Grouping start
bool bGroupExisting = false;
for (int i = 0; i < devicesListView.Groups.Count; i++)
if ((node.mesh != null && devicesListView.Groups[i].Header == node.mesh.name) || (node.mesh == null && devicesListView.Groups[i].Header == ""))
{
bGroupExisting = true;
node.listitem.Group = devicesListView.Groups[i];
break;
}
if (!bGroupExisting)
{
ListViewGroup grp = devicesListView.Groups.Add(devicesListView.Groups.Count.ToString(), ((node.mesh == null) ? "" : node.mesh.name));
node.listitem.Group = grp;
ListViewGroup[] groups = new ListViewGroup[this.devicesListView.Groups.Count];
ListViewGroup[] groups = new ListViewGroup[this.devicesListView.Groups.Count];
this.devicesListView.Groups.CopyTo(groups, 0);
this.devicesListView.Groups.CopyTo(groups, 0);
Array.Sort(groups, new GroupComparer());
Array.Sort(groups, new GroupComparer());
this.devicesListView.BeginUpdate();
this.devicesListView.Groups.Clear();
this.devicesListView.Groups.AddRange(groups);
this.devicesListView.EndUpdate();
this.devicesListView.BeginUpdate();
this.devicesListView.Groups.Clear();
this.devicesListView.Groups.AddRange(groups);
this.devicesListView.EndUpdate();
foreach(ListViewGroup lvg in devicesListView.Groups)
{
if(lvg.Header == "Repos")
ListViewExtended.setGrpState(lvg, ListViewGroupState.Collapsible | ListViewGroupState.Normal);
else
ListViewExtended.setGrpState(lvg, ListViewGroupState.Collapsible | ListViewGroupState.Collapsed);
}
}
// *** Flynn Groupng end
foreach (ListViewGroup lvg in devicesListView.Groups)
{
if (lvg.Header == "Repos")
ListViewExtended.setGrpState(lvg, ListViewGroupState.Collapsible | ListViewGroupState.Normal);
else
ListViewExtended.setGrpState(lvg, ListViewGroupState.Collapsible | ListViewGroupState.Collapsed);
}
}
// *** Flynn Groupng end
bool connVisible = ((showOfflineDevicesToolStripMenuItem.Checked) || ((node.conn & 1) != 0)) || (node.mtype == 3);
bool connVisible = ((showOfflineDevicesToolStripMenuItem.Checked) || ((node.conn & 1) != 0)) || (node.mtype == 3);
int imageIndex = (node.icon - 1) * 2;
if (((node.conn & 1) == 0) && (node.mtype != 3)) { imageIndex++; }
device.ImageIndex = imageIndex;
@@ -2258,7 +2258,8 @@ namespace MeshCentralRouter
private void customAppsToolStripMenuItem_Click(object sender, EventArgs e)
{
CustomAppsForm f = new CustomAppsForm(Settings.GetApplications());
if (f.ShowDialog(this) == DialogResult.OK) {
if (f.ShowDialog(this) == DialogResult.OK)
{
Settings.SetApplications(f.getApplications());
}
}