Skip to content

Commit 6a9121a

Browse files
author
Juan Segura
committed
v1.0.0-beta9
Bug retrieving external tools
1 parent 0ed9569 commit 6a9121a

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

ZXBSInstaller/Controls/MainControl.axaml.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,20 +111,17 @@ private void GetExternalTools()
111111
// Get tools
112112
var tools = ServiceLayer.GetExternalTools();
113113

114-
Dispatcher.UIThread.Post(() =>
114+
HideStatusPanel();
115+
if (tools == null)
115116
{
116-
HideStatusPanel();
117-
if (tools == null)
118-
{
119-
// Error!
120-
ShowMessage("Error retrieving the list of tools, please check your Internet connection.\r\nIt may be a temporary server error, report the error to duefectucorp@gmail.com and try again later.");
121-
}
122-
else
123-
{
124-
// Show tools
125-
ShowData();
126-
}
127-
});
117+
// Error!
118+
ShowMessage("Error retrieving the list of tools, please check your Internet connection.\r\nIt may be a temporary server error, report the error to duefectucorp@gmail.com and try again later.");
119+
}
120+
else
121+
{
122+
// Show tools
123+
ShowData();
124+
}
128125
}
129126

130127

@@ -133,19 +130,22 @@ private void GetExternalTools()
133130
/// </summary>
134131
private void ShowData()
135132
{
136-
toolItemControls.Clear();
137-
var tools = ServiceLayer.ExternalTools;
138-
139-
pnlTools.Children.Clear();
140-
foreach (var tool in tools)
133+
Dispatcher.UIThread.Post(() =>
141134
{
142-
// Create on ToolItemControl foreach tool
143-
var control = new ToolItemControl(tool, Command_Received);
144-
toolItemControls.Add(control);
145-
pnlTools.Children.Add(control);
146-
}
147-
// Update summary area
148-
UpdateSummary();
135+
toolItemControls.Clear();
136+
var tools = ServiceLayer.ExternalTools;
137+
138+
pnlTools.Children.Clear();
139+
foreach (var tool in tools)
140+
{
141+
// Create on ToolItemControl foreach tool
142+
var control = new ToolItemControl(tool, Command_Received);
143+
toolItemControls.Add(control);
144+
pnlTools.Children.Add(control);
145+
}
146+
// Update summary area
147+
UpdateSummary();
148+
});
149149
}
150150

151151

ZXBSInstaller/ZXBSInstaller.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
88
<ApplicationIcon>zxbs.ico</ApplicationIcon>
9-
<Version>1.0.0.8</Version>
9+
<Version>1.0.0.9</Version>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<None Remove="Assets\cancel.svg" />

ZXBSInstaller/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0.8
1+
1.0.0.9

0 commit comments

Comments
 (0)