Merge branch '2dust:master' into master

Bug fix
https://github.com/2dust/v2rayN/issues/8906
2026-04-16 04:25:45 +00:00 · 2026-03-16 00:06:35 +08:00 · 2026-03-15 20:11:45 +08:00
1 changed files with 13 additions and 3 deletions
--- 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 _);
        }
    }
Author	SHA1	Message	Date
JieXu	5c4761697f	Merge branch '2dust:master' into master	2026-03-16 00:06:35 +08:00
2dust	eb0ef90ed2	Bug fix Some checks failed release Linux / build (Release) (push) Has been cancelled Details release macOS / build (Release) (push) Has been cancelled Details release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled Details release Windows / build (Release) (push) Has been cancelled Details release Linux / rpm (push) Has been cancelled Details https://github.com/2dust/v2rayN/issues/8906	2026-03-15 20:11:45 +08:00