Fixed possible crash pushing STOP on song playback in FRB Editor

Fixed NAudio codegen bug when loaded only when referenced
vchelaru · Jan 27, 2024 · abb5e83 · abb5e83
1 parent 3f89dcd
commit abb5e83
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/FRBDK/Glue/Glue/CodeGeneration/ReferencedFileSaveCodeGenerator.cs b/FRBDK/Glue/Glue/CodeGeneration/ReferencedFileSaveCodeGenerator.cs
@@ -64,7 +64,7 @@ public static void RefreshGlobalContentDictionary()
 
         }
 
-        #region Generate Fields (Static Members)
+        #region Fields (Static Members)
 
         public override ICodeBlock GenerateFields(ICodeBlock codeBlock,  SaveClasses.IElement element)
         {
@@ -91,8 +91,9 @@ public override ICodeBlock GenerateFields(ICodeBlock codeBlock,  SaveClasses.IEl
 
             for (int i = 0; i < element.ReferencedFiles.Count; i++)
             {
+                var file = element.ReferencedFiles[i];
                 AppendFieldOrPropertyForReferencedFile(codeBlock,
-                    element.ReferencedFiles[i], element, contentManagerName);
+                    file, element, contentManagerName);
 
                 //stringBuilder.AppendLine(GetFieldForReferencedFile(mSaveObject.ReferencedFiles[i]));
 
@@ -178,6 +179,8 @@ public static void AppendFieldOrPropertyForReferencedFile(ICodeBlock codeBlock,
 
         #endregion
 
+        #region Initialize
+
         public override ICodeBlock GenerateInitialize(ICodeBlock codeBlock,  SaveClasses.IElement element)
         {
             for (int i = 0; i < element.ReferencedFiles.Count; i++)
@@ -195,6 +198,8 @@ public override ICodeBlock GenerateInitialize(ICodeBlock codeBlock,  SaveClasses
             return codeBlock;
         }
 
+        #endregion
+
         public static void GenerateAddToManagersStatic(ICodeBlock codeBlock,  SaveClasses.IElement element)
         {
             for (int i = 0; i < element.ReferencedFiles.Count; i++)

diff --git a/FRBDK/Glue/NAudioPlugin/Managers/AssetTypeInfoManager.cs b/FRBDK/Glue/NAudioPlugin/Managers/AssetTypeInfoManager.cs
@@ -122,12 +122,15 @@ private static string GetLoadSongCode(IElement screenOrEntity, NamedObjectSave n
             ReferencedFileSave file, string contentManager)
         {
             var instanceName = file.GetInstanceName();
-
+            if(file.LoadedOnlyWhenReferenced)
+            {
+                instanceName = "m" + instanceName;
+            }
             var relativeFileName = file.Name.ToLowerInvariant();
 
             var path = $"Content/{relativeFileName}";
 
-            var contentManagerName = "contentManagerName";
+            var contentManagerName = contentManagerName ?? "contentManagerName";
 
             if(file.DestroyOnUnload == false)
             {

diff --git a/FRBDK/Glue/OfficialPlugins/SongPlugin/Views/MainSongControl.xaml.cs b/FRBDK/Glue/OfficialPlugins/SongPlugin/Views/MainSongControl.xaml.cs
@@ -1,4 +1,5 @@
-using FlatRedBall.IO;
+using FlatRedBall.Glue.Plugins.ExportedImplementations;
+using FlatRedBall.IO;
 using NAudio.Vorbis;
 using NAudio.Wave;
 using OfficialPlugins.SongPlugin.ViewModels;
@@ -96,15 +97,27 @@ private void StopButton_Click(object sender, RoutedEventArgs e)
 
         internal void StopPlaying()
         {
-
-            if (mediaPlayer != null)
+            // There seems to be some threading issue here, so let's try multiple times, then
+            // tolerate the error so we don't lose the plugin:
+            try
             {
-                mediaPlayer.Stop();
-                mediaPlayer.Position = TimeSpan.Zero;
+                GlueCommands.Self.TryMultipleTimes(() =>
+                {
 
-            }
+                    if (mediaPlayer != null)
+                    {
+                        mediaPlayer.Stop();
+                        mediaPlayer.Position = TimeSpan.Zero;
 
-            nAudioOutputDevice?.Stop();
+                    }
+
+                    nAudioOutputDevice?.Stop();
+                });
+            }
+            catch(Exception ex)
+            {
+                GlueCommands.Self.PrintError("Error stopping song:\n" + ex);
+            }
         }
 
         internal void PlaySong()