'修复首次使用，添加订阅节点后，更新服务器失败的问题'

Rygtx · Jun 7, 2023 · 4bca031 · 4bca031
1 parent 26fb170
commit 4bca031
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/default.aproj b/default.aproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="WinXray" libEmbed="true" icon="\forms\ico\app.ico" ui="win" output="WinXray.exe" CompanyName="WinXray" FileDescription="网络代理通用客户端" LegalCopyright="Copyright (C) WinXray" ProductName="WinXray" InternalName="WinXray" FileVersion="4.6.1" ProductVersion="4.6.1" publishDir="\WinXray" dstrip="false" local="false" ignored="false">
+<project ver="10" name="WinXray" libEmbed="true" icon="\forms\ico\app.ico" ui="win" output="WinXray.exe" CompanyName="WinXray" FileDescription="网络代理通用客户端" LegalCopyright="Copyright (C) WinXray" ProductName="WinXray" InternalName="WinXray" FileVersion="4.6.2" ProductVersion="4.6.2" publishDir="\WinXray" dstrip="false" local="false" ignored="false">
 	<file name="main" path="main.aardio"/>
 	<folder name="窗体" path="forms" comment="" embed="true" local="false" ignored="false">
 		<folder name="ico" path="forms\ico" comment="forms\ico" local="false" embed="false" ignored="false">

diff --git a/forms/main/xray.aardio b/forms/main/xray.aardio
@@ -1202,9 +1202,6 @@ frmXray.btnImportServerFromClipBd.oncommand = function(id,event){
 
 		var outbounds = xray.outbounds.importFromString(str);
 		if(#outbounds){
-			if(config.proxy.outbounds===null){
-				config.proxy.outbounds = ..table.array();
-			}
 			..table.append(config.proxy.outbounds,outbounds);
 			// 防止首次粘贴时，下载core失败导致没有保存节点的情况，所以手动save一下
 			config.proxy.save();

diff --git a/lib/config.aardio b/lib/config.aardio
@@ -46,6 +46,10 @@ if(!config.proxy.hotkey){
 	config.proxy.hotkey = {1/*_MOD_ALT*/|2/*_MOD_CONTROL*/|4/*_MOD_SHIFT*/;'P'#}
 }
 
+if(config.proxy.outbounds === null){
+	config.proxy.outbounds = ..table.array();
+}
+
 config.__resetDefaultCore = function(){
 	config.core.default =  {
 		inbounds={

diff --git a/main.aardio b/main.aardio
@@ -162,7 +162,7 @@ import win.ui;
 /*DSG{{*/
 mainForm = win.form(text="WinXray";right=1019;bottom=679;bgcolor=15793151;border="none")
 mainForm.add(
-caption={cls="bkplus";text="WinXray V4.6.1";left=25;top=9;right=685;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=6};
+caption={cls="bkplus";text="WinXray V4.6.2";left=25;top=9;right=685;bottom=27;align="left";color=6052956;dl=1;dt=1;font=LOGFONT(h=-14);z=6};
 custom={cls="custom";left=83;top=40;right=1022;bottom=679;bgcolor=16777215;db=1;dl=1;dr=1;dt=1;z=3};
 navBar={cls="bkplus";left=0;top=37;right=83;bottom=681;bgcolor=3442175;db=1;dl=1;dt=1;z=1};
 navJsonConfig={cls="plus";text="配置";left=0;top=132;right=85;bottom=212;bkBottom=3;bkLeft=7;bkRight=8;bkTop=2;border={color=-65536};color=16777215;dl=1;dt=1;font=LOGFONT(h=-13);iconStyle={font=LOGFONT(h=-37;name='FontAwesome');padding={bottom=20}};iconText='\uF0F6';notify=1;textPadding={bottom=10};valign="bottom";x=0.5;y=0.2;z=5};