From b147e05794c59bb7c4580de09e465077282c119c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 31 Jan 2023 14:13:25 +0800
Subject: [PATCH] bug fix

---
 v2rayN/v2rayN/Converters/MaterialDesignFonts.cs    | 3 +--
 v2rayN/v2rayN/Handler/LazyConfig.cs                | 4 ++++
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs          | 2 +-
 v2rayN/v2rayN/Handler/StatisticsHandler.cs         | 1 -
 v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
index 5e7cfb89..fb37480a 100644
--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Windows.Media;
 
 namespace v2rayN.Converters
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index ee705f67..f53e72b2 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -95,6 +95,10 @@ namespace v2rayN.Handler
             }
             if (!Utils.IsNullOrEmpty(filter))
             {
+                if (filter.Contains("'"))
+                {
+                    filter = filter.Replace("'", "");
+                }
                 sql += $" and a.remarks like '%{filter}%'";
             }
             sql += " order by a.sort";
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index 858dc923..b99a5550 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -222,7 +222,7 @@ namespace v2rayN.Handler
                     continue;
                 }
                 if (it.delay < 0)
-                {    
+                {
                     UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
                     continue;
                 }
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index 3928aa3d..20be55f8 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -1,5 +1,4 @@
 using Grpc.Core;
-using ProtosLib.Statistics;
 using System.Net;
 using System.Net.Sockets;
 using v2rayN.Base;
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index 062ce32e..36c176aa 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -55,7 +55,7 @@ namespace v2rayN.ViewModels
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
         [Reactive] public bool AutoHideStartup { get; set; }
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
-        [Reactive] public bool EnableDragDropSort { get; set; }        
+        [Reactive] public bool EnableDragDropSort { get; set; }
         [Reactive] public int autoUpdateInterval { get; set; }
         [Reactive] public int autoUpdateSubInterval { get; set; }
         [Reactive] public int trayMenuServersLimit { get; set; }