From eb0ef90ed254ba14f637eaccd1f6e0b4039e4bcd Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 15 Mar 2026 20:11:45 +0800
Subject: [PATCH] Bug fix

https://github.com/2dust/v2rayN/issues/8906
---
 v2rayN/ServiceLib/ViewModels/MsgViewModel.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
index 06657a93..fbe06cb0 100644
--- a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
@@ -86,15 +86,25 @@ public class MsgViewModel : MyReactiveObject
             }
             catch (Exception ex)
             {
-                _queueMsg.Enqueue(ex.Message);
+                EnqueueWithLimit(ex.Message);
                 _lastMsgFilterNotAvailable = true;
             }
         }
 
-        _queueMsg.Enqueue(msg);
+        EnqueueWithLimit(msg);
         if (!msg.EndsWith(Environment.NewLine))
         {
-            _queueMsg.Enqueue(Environment.NewLine);
+            EnqueueWithLimit(Environment.NewLine);
+        }
+    }
+
+    private void EnqueueWithLimit(string item)
+    {
+        _queueMsg.Enqueue(item);
+
+        while (_queueMsg.Count > NumMaxMsg)
+        {
+            _queueMsg.TryDequeue(out _);
         }
     }