From 6b12549cd9f9dc055f27fa7ee77c25a73fdd13cb Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:15:17 +0800
Subject: [PATCH] bug fixes

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs     | 6 +++---
 v2rayN/v2rayN/Handler/CoreConfigHandler.cs | 3 ++-
 v2rayN/v2rayN/Handler/MainFormHandler.cs   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 4f3c9a80..ea896323 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -463,9 +463,9 @@ namespace v2rayN.Handler
             }
             if (lstProfile.Count > 0)
             {
-                return SetDefaultServerIndex(ref config, lstProfile[0].indexId);
+                return SetDefaultServerIndex(ref config, lstProfile.Where(t => t.port > 0).FirstOrDefault()?.indexId);
             }
-            return SetDefaultServerIndex(ref config, SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).FirstOrDefault());
+            return SetDefaultServerIndex(ref config, SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
         }
         public static ProfileItem? GetDefaultServer(ref Config config)
         {
@@ -1017,7 +1017,7 @@ namespace v2rayN.Handler
                     addStatus = AddVlessServer(ref config, profileItem, false);
                 }
 
-                if (addStatus == 0)
+                if (addStatus == 0 && profileItem.port > 0)
                 {
                     countServers++;
                     lstAdd.Add(profileItem);
diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
index 7dc8319b..f64e3086 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -910,7 +910,8 @@ namespace v2rayN.Handler
         {
             try
             {
-                if (node == null)
+                if (node == null
+                    || node.port <= 0)
                 {
                     msg = ResUI.CheckServerSettings;
                     return -1;
diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs
index 01afb56f..587df807 100644
--- a/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs
@@ -10,7 +10,7 @@ namespace v2rayN.Handler
 {
     public sealed class MainFormHandler
     {
-        private static readonly Lazy<MainFormHandler> instance = new(() => new());        
+        private static readonly Lazy<MainFormHandler> instance = new(() => new());
         public static MainFormHandler Instance => instance.Value;
 
         public Icon GetNotifyIcon(Config config)