Browse Source

Bug fix for check update

pull/5829/head
2dust 2 months ago
parent
commit
20bb263b06
  1. 7
      v2rayN/ServiceLib/Handler/UpdateHandler.cs
  2. 8
      v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

7
v2rayN/ServiceLib/Handler/UpdateHandler.cs

@ -109,7 +109,8 @@ namespace ServiceLib.Handler
_updateFunc(false, args.Msg);
url = args.Url;
fileName = Utils.GetTempPath(Utils.GetGUID());
var ext = Path.GetExtension(url);
fileName = Utils.GetTempPath(Utils.GetGUID()+ ext);
await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
}
else
@ -322,9 +323,9 @@ namespace ServiceLib.Handler
}
using Process p = new();
p.StartInfo.FileName = filePath.AppendQuotes();
p.StartInfo.FileName = filePath;
p.StartInfo.Arguments = coreInfo.versionArg;
p.StartInfo.WorkingDirectory = Utils.StartupPath();
p.StartInfo.WorkingDirectory = Utils.GetConfigPath();
p.StartInfo.UseShellExecute = false;
p.StartInfo.RedirectStandardOutput = true;
p.StartInfo.CreateNoWindow = true;

8
v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@ -196,20 +196,20 @@ namespace ServiceLib.ViewModels
});
}
private void UpdateFinished()
private async Task UpdateFinished()
{
if (_lstUpdated.Count > 0 && _lstUpdated.Count(x => x.isFinished == true) == _lstUpdated.Count)
{
_updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, false);
Task.Delay(1000);
await Task.Delay(2000);
UpgradeCore();
if (_lstUpdated.Any(x => x.coreType == _v2rayN && x.isFinished == true))
{
Task.Delay(1000);
await Task.Delay(1000);
UpgradeN();
}
Task.Delay(1000);
await Task.Delay(1000);
_updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, true);
}
}

Loading…
Cancel
Save