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

Commit 32b8123

Browse files
committed
fix: Better identify last server after updating subscriptions
1 parent 1799433 commit 32b8123

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

shadowsocks-csharp/Controller/MenuViewController.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,19 @@ private void UpdateNodeCheckerNewNodeFound(object sender, EventArgs e)
520520
&& server.Remarks == selectedServer.Remarks
521521
);
522522
}
523+
524+
if (selectedIndex < 0)
525+
{
526+
selectedIndex = config.Configs.FindIndex(server =>
527+
server.SubTag == selectedServer.SubTag
528+
&& server.Group == selectedServer.Group
529+
);
530+
}
531+
532+
if (selectedIndex < 0)
533+
{
534+
selectedIndex = config.Configs.FindIndex(server => server.SubTag == selectedServer.SubTag);
535+
}
523536
}
524537

525538
config.Index = selectedIndex < 0 ? default : selectedIndex;
@@ -529,9 +542,11 @@ private void UpdateNodeCheckerNewNodeFound(object sender, EventArgs e)
529542
{
530543
foreach (var serverSubscribe in config.ServerSubscribes.Where(serverSubscribe => serverSubscribe.Url == Global.UpdateNodeChecker.SubscribeTask.Url))
531544
{
532-
serverSubscribe.LastUpdateTime = (ulong)Math.Floor(DateTime.Now.Subtract(new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds);
545+
serverSubscribe.LastUpdateTime = (ulong)DateTimeOffset.Now.ToUnixTimeSeconds();
533546
}
534-
config.Configs.RemoveAll(server => server.IsMatchServer(new Server()));
547+
548+
var defaultServer = new Server();
549+
config.Configs.RemoveAll(server => server.IsMatchServer(defaultServer));
535550
}
536551
controller.SaveServersConfig(config, true);
537552
}

shadowsocks-csharp/shadowsocksr.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<PackageReference Include="RouteMatcher" Version="1.0.0" />
6060
<PackageReference Include="RunAtStartup" Version="5.0.2" />
6161
<PackageReference Include="Shadowsocks.Protocol" Version="0.9.9" />
62-
<PackageReference Include="Syncfusion.SfGrid.WPF" Version="19.2.0.59" />
63-
<PackageReference Include="Syncfusion.SfTreeView.WPF" Version="19.2.0.59" />
62+
<PackageReference Include="Syncfusion.SfGrid.WPF" Version="19.3.0.45" />
63+
<PackageReference Include="Syncfusion.SfTreeView.WPF" Version="19.3.0.45" />
6464
<PackageReference Include="URIScheme" Version="5.0.0" />
6565
<PackageReference Include="WindowsProxy" Version="5.0.6" />
6666
<PackageReference Include="WpfColorFontDialog" Version="1.0.8" />

0 commit comments

Comments
 (0)