Skip to content
This repository was archived by the owner on Jun 29, 2025. It is now read-only.

Commit ceeb6b2

Browse files
authored
Merge pull request #31 from sepluginloader/dev
v1.9.1
2 parents 0eab01f + 19e823f commit ceeb6b2

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

PluginLoader/GUI/PluginDetails.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ public PluginData Plugin
6464
return;
6565

6666
plugin = value;
67-
if (Main.Instance.TryGetPluginInstance(plugin.Id, out PluginInstance instance))
68-
this.instance = instance;
6967

7068
if (plugin == null)
7169
{
@@ -74,6 +72,11 @@ public PluginData Plugin
7472
return;
7573
}
7674

75+
if (Main.Instance.TryGetPluginInstance(plugin.Id, out PluginInstance instance))
76+
this.instance = instance;
77+
else
78+
this.instance = null;
79+
7780
EnableControls();
7881
LoadPluginData();
7982
}
@@ -154,6 +157,7 @@ public void LoadPluginData()
154157
enableCheckbox.IsChecked = pluginsDialog.AfterRebootEnableFlags[plugin.Id];
155158

156159
configButton.Enabled = instance != null && instance.HasConfigDialog;
160+
configButton.Visible = instance != null;
157161
}
158162

159163
private readonly PluginStat dummyStat = new();

PluginLoader/Main.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using avaness.PluginLoader.GUI;
1414
using avaness.PluginLoader.Data;
1515
using avaness.PluginLoader.Stats;
16+
using System.Net;
1617

1718
namespace avaness.PluginLoader
1819
{
@@ -44,6 +45,16 @@ public Main()
4445

4546
LogFile.Init(pluginsDir);
4647
LogFile.WriteLine("Starting - v" + Assembly.GetExecutingAssembly().GetName().Version.ToString(3));
48+
49+
// Fix tls 1.2 not supported on Windows 7 - github.com is tls 1.2 only
50+
try
51+
{
52+
ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
53+
}
54+
catch (NotSupportedException e)
55+
{
56+
LogFile.WriteLine("An error occurred while setting up networking, web requests will probably fail: " + e);
57+
}
4758

4859
Splash.SetText("Finding references...");
4960
RoslynReferences.GenerateAssemblyList();

PluginLoader/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.9.0.0")]
36-
[assembly: AssemblyFileVersion("1.9.0.0")]
35+
[assembly: AssemblyVersion("1.9.1.0")]
36+
[assembly: AssemblyFileVersion("1.9.1.0")]

RunPluginLoader/RunPluginLoader.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="System" />
38-
<Reference Include="System.Core" />
3938
<Reference Include="System.Windows.Forms" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Net.Http" />
45-
<Reference Include="System.Xml" />
4639
<Reference Include="VRage">
4740
<HintPath>..\Bin64\VRage.dll</HintPath>
4841
</Reference>

0 commit comments

Comments
 (0)