Merge pull request #447 from NeoCoderMatrix86/438-setting-audiofile-can-not-be-undone

Setting audiofile can not be undone

Author: NeoCoderMatrix86

AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs

@@ -384,14 +384,16 @@ public void StopRecording()
             IsRecordingChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        public void RecalculateLastTrackEnd()
+        public Boolean RecalculateLastTrackEnd()
         {
             //Try to recalculate length by recalculating last track
             var lastTrack = tracks.LastOrDefault();
             if (lastTrack != null)
             {
                 RecalculateTrackProperties(lastTrack);
+                return true;
             }
+            return false;
         }
 
         public override ValidationResult Validate(string property)

AudioCuesheetEditor/Services/UI/TraceChangeManager.cs

@@ -217,14 +217,11 @@ public bool BulkEdit
         public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
         {
             var edit = undoStack.FirstOrDefault(targetEdit);
-            if (edit != null)
+            if ((edit != null) && (undoStack.Count > 0))
             {
-                if (undoStack.Count > 0)
-                {
-                    var lastEdits = undoStack.Pop();
-                    edit.Changes.AddRange(lastEdits.Changes);
-                    UndoDone?.Invoke(this, EventArgs.Empty);
-                }
+                var lastEdits = undoStack.Pop();
+                edit.Changes.AddRange(lastEdits.Changes);
+                UndoDone?.Invoke(this, EventArgs.Empty);
             }
         }
 

AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor

@@ -62,12 +62,11 @@ along with Foobar.  If not, see
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected override void OnParametersSet()
     {
-        await base.OnAfterRenderAsync(firstRender);
-        if (form != null)
+        base.OnParametersSet();
+        if (form?.IsTouched == true)
         {
-            await form.Validate();
             SetAudiofileValidationText();
         }
     }
@@ -83,8 +82,10 @@ along with Foobar.  If not, see
         {
             Cuesheet.Audiofile = await _fileInputManager.CreateAudiofileAsync(fileInputAudiofileId, browserFile, x => 
             {
-                Cuesheet.RecalculateLastTrackEnd();
-                TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
+                if (Cuesheet.RecalculateLastTrackEnd())
+                {
+                    TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
+                }
             });
         }
         catch(ArgumentException ae)