Merge pull request #2766 from wabbajack-tools/post_compilation_freeze

Fix post compilation freezes

Author: tr4wzified

CHANGELOG.md

@@ -6,8 +6,9 @@
 * Added 2FA support for MEGA login, added some extra logging for MEGA logins
   * Special thanks to [@erri120](https://www.github.com/erri120) who originally implemented part of this in Wabbajack and the MegaApiClient library 4 years ago, which made the change rather easy
 * Added a warning for when WebView is not loading
-* Add progress indicator to the publish button after compilation (thanks to [@JanuarySnow](https://www.github.com/JanuarySnow)))
+* Add progress indicator to the publish button after compilation (thanks to [@JanuarySnow](https://www.github.com/JanuarySnow))
 * Improve validation before being able to install, should avoid users installing to important folders/the Wabbajack installation directory
+* Adjusted the in-app log viewer to not constantly queue updates but to update it periodically instead to avoid freezes when too many log rows are queued (thanks to [@JanuarySnow](https://www.github.com/JanuarySnow))
 
 #### Version - 4.0.0.3 - 3/20/2025
 * Fixed the open logs folder button not actually opening the logs folder on a failed installation

Wabbajack.App.Wpf/Models/LogStream.cs

@@ -33,17 +33,22 @@ public LogStream()
             .DisposeWith(_disposables);
 
         Messages
-            .Subscribe(m =>
+            .Buffer(TimeSpan.FromMilliseconds(100))
+            .Where(batch => batch.Count > 0)
+            .Subscribe(batch =>
             {
-                RxApp.MainThreadScheduler.Schedule(m, (_, message) =>
+                RxApp.MainThreadScheduler.Schedule(batch, (scheduler, messages) =>
                 {
-                    _messageLog.AddOrUpdate(message);
+                    _messageLog.Edit(innerCache =>
+                    {
+                        foreach (var message in messages)
+                            innerCache.AddOrUpdate(message);
+                    });
+
                     return Disposable.Empty;
                 });
             })
             .DisposeWith(_disposables);
-
-        _messages.DisposeWith(_disposables);
     }
 
     protected override void Dispose(bool disposing)

Wabbajack.App.Wpf/Util/AutoScrollBehavior.cs

@@ -84,12 +84,15 @@ private class Capture : IDisposable
         {
             private readonly INotifyCollectionChanged _incc;
             private readonly ListBox _listBox;
+            private DateTime _lastScrollTime = DateTime.MinValue;
+            private readonly TimeSpan _throttleInterval = TimeSpan.FromMilliseconds(100);
 
             public Capture(ListBox listBox)
             {
-                this._listBox = listBox;
+                _listBox = listBox;
                 _incc = listBox.ItemsSource as INotifyCollectionChanged;
-                if (_incc != null) _incc.CollectionChanged += incc_CollectionChanged;
+                if (_incc != null)
+                    _incc.CollectionChanged += incc_CollectionChanged;
             }
 
             public void Dispose()
@@ -100,15 +103,47 @@ public void Dispose()
 
             private void incc_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
             {
-                if (e.Action == NotifyCollectionChangedAction.Add)
+                if (e.Action != NotifyCollectionChangedAction.Add || e.NewItems == null || e.NewItems.Count == 0)
+                    return;
+
+                // Throttle to avoid layout storms
+                var now = DateTime.Now;
+                if (now - _lastScrollTime < _throttleInterval)
+                    return;
+
+                _lastScrollTime = now;
+
+                // Defer to Dispatcher to ensure layout has completed
+                Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                 {
+                    var item = e.NewItems[0];
+
+                    // Avoid triggering if item is already in view
+                    if (IsItemVisible(_listBox, item))
+                        return;
+
                     try
                     {
-                        _listBox.ScrollIntoView(e.NewItems[0]);
-                        _listBox.SelectedItem = e.NewItems[0];
+                        _listBox.ScrollIntoView(item);
+                        _listBox.SelectedItem = item;
                     }
-                    catch (ArgumentOutOfRangeException) { }
-                }
+                    catch (ArgumentOutOfRangeException)
+                    {
+                        // Safe fallback
+                    }
+                }), System.Windows.Threading.DispatcherPriority.Background);
+            }
+
+            private static bool IsItemVisible(ListBox listBox, object item)
+            {
+                var container = listBox.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
+                if (container == null)
+                    return false;
+
+                var bounds = container.TransformToAncestor(listBox)
+                                      .TransformBounds(new Rect(0, 0, container.ActualWidth, container.ActualHeight));
+                var viewport = new Rect(0, 0, listBox.ActualWidth, listBox.ActualHeight);
+                return viewport.Contains(bounds.TopLeft) || viewport.Contains(bounds.BottomRight);
             }
         }
     }