Now remembers if video/audiovizualizer was shown/hidden + fixed crash after a "new"

Author: niksedk

SubtitleEdit/AppDelegate.cs

@@ -50,15 +50,15 @@ public override void DidFinishLaunching(NSNotification notification)
                 _mainWindowController.FindPrevious();
             };
 
-            _videoOpen.Activated += (object sender, EventArgs e) => 
+            _videoOpen.Activated += (object sender, EventArgs e) =>
             {
                 _mainWindowController.OpenVideo();
             };
 
-            _menuItemSpellCheck.Activated += (object sender, EventArgs e) => 
-                {
-                    _mainWindowController.SpellCheckAndGrammer();
-                };
+            _menuItemSpellCheck.Activated += (object sender, EventArgs e) =>
+            {
+                _mainWindowController.SpellCheckAndGrammer();
+            };
         }
 
         public NSMenuItem OpenRecent { get { return _openRecent; } }

SubtitleEdit/Windows/MainWindow.cs

@@ -158,7 +158,6 @@ void InitializeSubtitleTable()
                 }
             };
 
-
             // drag'n'drop
             _subtitleTable.RegisterForDraggedTypes(new string[] { "public.data" });
         }
@@ -239,10 +238,12 @@ public void ShowHideAudioVisualizer()
             if (_audioVizBox.Hidden)
             {
                 _toolbarShowAudioViz.Image = NSImage.ImageNamed("WaveformToggle.png");
+                Configuration.Settings.General.ShowAudioVisualizer = false;
             }
             else
             {
                 _toolbarShowAudioViz.Image = NSImage.ImageNamed("WaveformToggleActive.png");
+                Configuration.Settings.General.ShowAudioVisualizer = true;
             }
         }
 
@@ -254,10 +255,12 @@ public void ShowHideVideoPlayer()
             if (_videoBox.Hidden)
             {
                 _toolbarShowVideo.Image = NSImage.ImageNamed("VideoToggle.png");
+                Configuration.Settings.General.ShowVideoPlayer = false;
             }
             else
             {
                 _toolbarShowVideo.Image = NSImage.ImageNamed("VideoToggleActive.png");
+                Configuration.Settings.General.ShowVideoPlayer = true;
             }
         }
 
@@ -354,7 +357,14 @@ public override void AwakeFromNib()
             _audioVisualizerView.SetFrameSize(_audioViz.Superview.Frame.Size);
             _audioVisualizerView.BecomeFirstResponder();
             _audioViz.Hidden = true;
-            ShowHideAudioVisualizer(); //TODO: Use settings when audio visualizer has been rewritten!
+            if (!Configuration.Settings.General.ShowAudioVisualizer)
+            {
+                ShowHideAudioVisualizer();
+            }
+            if (!Configuration.Settings.General.ShowVideoPlayer)
+            {
+                ShowHideVideoPlayer();
+            }
         }
 
         internal void ShowAddAudioVisualizer()

SubtitleEdit/Windows/MainWindowController.cs

@@ -69,8 +69,9 @@ private void SetupAudioVisualizer()
                 InvokeOnMainThread(() =>
                     {
                         _timerWaveform.Stop();
+
                         System.Threading.Thread.Sleep(100);
-                        if (_videoFileName != null)
+                        if (_videoFileName != null && _audioVisualizer != null)
                         {
                             int index = -1;
                             var selectedIndices = Window.SubtitleTable.SelectedRows.ToList();
@@ -281,6 +282,16 @@ public void NewSubtitle()
                 Window.SetEncoding(Encoding.UTF8.BodyName);
                 Window.SubtitleText.StringValue = string.Empty;
                 Window.SetTimeCode(new Paragraph());
+                if (_videoPlayer != null)
+                {
+                    _videoPlayer.DisposeVideoPlayer();
+                }
+                if (_audioVisualizer != null)
+                {
+                    _audioVisualizer.WavePeaks = null;
+                }
+                _videoFileName = null;
+                _audioVisualizer = null;
             }
         }
 
@@ -361,6 +372,11 @@ public void DeleteLines()
 
         public void ReloadDataKeepSelection()
         {
+            if (_subtitle == null || _subtitle.Paragraphs.Count == 0)
+            {
+                return;
+            }
+
             var selectedIndices = Window.SubtitleTable.SelectedRows;
             Window.SubtitleTable.ReloadData();
             foreach (var index in selectedIndices)