Skip to content

Commit da5dba4

Browse files
committed
fix memoryGroup initialization delay
1 parent fc21773 commit da5dba4

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

OpenHardwareMonitor/OpenHardwareMonitor.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Deterministic>false</Deterministic>
1616
<Platforms>AnyCPU;x64;x86</Platforms>
1717
<Configurations>Debug;Release</Configurations>
18+
<!-- <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>-->
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -62,6 +63,7 @@
6263
<PrivateAssets>all</PrivateAssets>
6364
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6465
</PackageReference>
66+
<!-- <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />-->
6567
</ItemGroup>
6668
<ItemGroup>
6769
<Reference Include="System.Configuration.Install" />

OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Diagnostics;
4-
using System.Linq;
54
using System.Text;
65
using System.Threading;
76
using System.Threading.Tasks;
@@ -40,10 +39,7 @@ public MemoryGroup(ISettings settings)
4039
return;
4140
}
4241

43-
if (!TryAddDimms(settings))
44-
{
45-
StartRetryTask(settings);
46-
}
42+
StartRetryTask(settings);
4743
}
4844

4945
public event HardwareEventHandler HardwareAdded;
@@ -119,19 +115,14 @@ private bool TryAddDimms(ISettings settings)
119115
private void StartRetryTask(ISettings settings)
120116
{
121117
_cancellationTokenSource = new CancellationTokenSource();
122-
123118
Task.Run(async () =>
124119
{
125120
int retryRemaining = 5;
126-
127121
while (!_cancellationTokenSource.IsCancellationRequested && --retryRemaining > 0)
128122
{
129-
await Task.Delay(TimeSpan.FromSeconds(2.5), _cancellationTokenSource.Token).ConfigureAwait(false);
130-
131123
if (TryAddDimms(settings))
132-
{
133124
break;
134-
}
125+
await Task.Delay(TimeSpan.FromSeconds(2.5), _cancellationTokenSource.Token).ConfigureAwait(false);
135126
}
136127
}, _cancellationTokenSource.Token);
137128
}

OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@
101101
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
102102
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
103103
</ItemGroup>
104-
</Project>
104+
</Project>

0 commit comments

Comments
 (0)