From 8d2890790eb437f024bff2b67c2cc4d404e48204 Mon Sep 17 00:00:00 2001
From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com>
Date: Wed, 19 Aug 2020 00:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=84=9A=E6=9C=AC=E7=AE=80?=
=?UTF-8?q?=E5=8C=96,=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86=E4=BB=A3?=
=?UTF-8?q?=E7=90=86=E6=8E=A7=E5=88=B6=E5=99=A8=E5=81=9C=E6=AD=A2=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=E6=97=A5=E5=BF=97=E6=9C=AA=E5=86=99=E5=85=A5=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B00?=
=?UTF-8?q?=E6=9D=A1=E8=AE=A2=E9=98=85=E4=B8=8D=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BUILD.ps1 | 14 ++++++--------
Netch.sln | 2 ++
Netch/Controllers/Interface/Instance.cs | 1 +
Netch/Forms/MainForm.MenuStrip.cs | 3 ++-
Netch/Netch.csproj | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/BUILD.ps1 b/BUILD.ps1
index 196c6dec..5b9db8db 100644
--- a/BUILD.ps1
+++ b/BUILD.ps1
@@ -16,19 +16,17 @@ function Build-NetFrameworkx64
$outdir = "$net_baseoutput\x64"
- msbuild -v:m -m -t:Build /p:Configuration="Release" /p:Platform="x64" /p:TargetFramework=net48 /p:Runtimeidentifier=win-x64 /restore
+ msbuild -v:n -m:1 /p:Configuration="Release" `
+ /p:Platform="x64" `
+ /p:TargetFramework=net48 `
+ /p:Runtimeidentifier=win-x64 `
+ /restore
if ($LASTEXITCODE) { cd $mainDir ; exit $LASTEXITCODE }
- Write-Host 'Build x64 Completed, start copy bin, mode, i18n file'
- Remove-Item -Recurse -Force "$net_baseoutput\x64\Release\win-x64\bin\tap-driver"
- Copy-Item -Recurse "$mainDir\binaries\*" "$net_baseoutput\x64\Release\win-x64\bin"
- Copy-Item -Recurse "$mainDir\modes\mode\*" "$net_baseoutput\x64\Release\win-x64\mode"
- Copy-Item -Recurse "$mainDir\translations\i18n\*" "$net_baseoutput\x64\Release\win-x64\i18n"
-
Write-Host 'Build done'
}
-cd $mainDir\Netch
+cd $mainDir
Build-NetFrameworkx64
cd $mainDir
diff --git a/Netch.sln b/Netch.sln
index 2c32b0a9..a1792b61 100644
--- a/Netch.sln
+++ b/Netch.sln
@@ -25,6 +25,8 @@ Global
{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.Build.0 = Release|x64
{828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Debug|x64.ActiveCfg = Debug|x64
{828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Debug|x64.Build.0 = Debug|x64
+ {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Release|x64.ActiveCfg = Release|x64
+ {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Netch/Controllers/Interface/Instance.cs b/Netch/Controllers/Interface/Instance.cs
index 1321f595..6398c130 100644
--- a/Netch/Controllers/Interface/Instance.cs
+++ b/Netch/Controllers/Interface/Instance.cs
@@ -169,6 +169,7 @@ namespace Netch.Controllers
{
SaveBufferTimer.Enabled = false;
}
+ SaveBufferTimerEvent(null,null);
State = State.Stopped;
}
diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs
index 44f9c09b..2b16f0f7 100644
--- a/Netch/Forms/MainForm.MenuStrip.cs
+++ b/Netch/Forms/MainForm.MenuStrip.cs
@@ -187,8 +187,9 @@ namespace Netch.Forms
foreach (var x in result) x.Group = item.Remark;
Global.Settings.Server.AddRange(result);
- NotifyTip(i18N.TranslateFormat("Update {1} server(s) from {0}", item.Remark, result.Count));
}
+
+ NotifyTip(i18N.TranslateFormat("Update {1} server(s) from {0}", item.Remark, result?.Count ?? 0));
}
}
catch (WebException e)
diff --git a/Netch/Netch.csproj b/Netch/Netch.csproj
index e2466d5a..e6946e0e 100644
--- a/Netch/Netch.csproj
+++ b/Netch/Netch.csproj
@@ -107,6 +107,6 @@
-
+