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

Commit d156d58

Browse files
committed
don't detect inmainship profile as the main profile
don't switch profiles when EliteDangerous64 process is not running
1 parent d3babe0 commit d156d58

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

Elite/Buttons/StreamDeckCommon.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
using EliteJournalReader.Events;
1111
using Newtonsoft.Json.Linq;
1212
using System.Globalization;
13+
using NLog.Fluent;
14+
using System.Diagnostics;
1315

1416
namespace Elite.Buttons
1517
{
@@ -334,6 +336,18 @@ public static void HandleOnTick(ISDConnection connection)
334336
_lastStatus.Add(deviceInfo.Id, null);
335337
}
336338

339+
try
340+
{
341+
var bProcess = Process.GetProcessesByName("EliteDangerous64").FirstOrDefault();
342+
343+
if (bProcess == null) return;
344+
345+
}
346+
catch (Exception ex)
347+
{
348+
// do nothing
349+
}
350+
337351
/*
338352
EliteData.StatusData.GuiFocus == StatusGuiFocus.InternalPanel
339353
EliteData.StatusData.GuiFocus == StatusGuiFocus.ExternalPanel

Elite/Elite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
9595
</Reference>
9696
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
97-
<HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
97+
<HintPath>..\packages\NLog.5.1.1\lib\net46\NLog.dll</HintPath>
9898
</Reference>
9999
<Reference Include="streamdeck-client-csharp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
100100
<HintPath>..\packages\streamdeck-client-csharp.4.3.0\lib\netstandard2.0\streamdeck-client-csharp.dll</HintPath>

Elite/Profile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static List<ProfileType> GetProfileTypes(string name)
134134

135135
name = name.ToLower();
136136

137-
if (name.Contains("main"))
137+
if (name.Contains("main") && !name.Contains("inmainship"))
138138
{
139139
profiles.Add(ProfileType.Main);
140140
return profiles;

Elite/Properties/AssemblyInfo.cs

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

Elite/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"Name": "Elite Dangerous",
178178
"Icon": "Images/pluginIcon",
179179
"URL": "https://github.com/mhwlng/streamdeck-elite",
180-
"Version": "2.5.3",
180+
"Version": "2.5.4",
181181
"CodePath": "com.mhwlng.elite",
182182
"Category": "Elite Dangerous",
183183
"CategoryIcon": "Images/categoryIcon",

Elite/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="NAudio.WinForms" version="2.1.0" targetFramework="net48" />
1414
<package id="NAudio.WinMM" version="2.1.0" targetFramework="net48" />
1515
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
16-
<package id="NLog" version="5.1.0" targetFramework="net48" />
16+
<package id="NLog" version="5.1.1" targetFramework="net48" />
1717
<package id="streamdeck-client-csharp" version="4.3.0" targetFramework="net472" />
1818
<package id="StreamDeck-Tools" version="5.9.1-Beta1" targetFramework="net48" />
1919
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />

0 commit comments

Comments
 (0)