v1.1.1 - Separate audio import checks

VoidXH · Mar 19, 2023 · d1d0b77 · d1d0b77
1 parent fbef6a1
commit d1d0b77
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/TriviaMurderPartyModder/MainWindow.FinalRound.cs b/TriviaMurderPartyModder/MainWindow.FinalRound.cs
@@ -74,8 +74,12 @@ void AddTopicChoices(object _, RoutedEventArgs e) {
             }
         }
 
-        void AddTopicAudio(object _, RoutedEventArgs e) =>
-            selectedTopic.ImportTopicAudio(finalRoundList.DataFolderPath, LoadAudio(questions, questionList));
+        void AddTopicAudio(object _, RoutedEventArgs e) {
+            string file = LoadAudio(finalRounders, finalRoundList);
+            if (file != null) {
+                selectedTopic.ImportTopicAudio(finalRoundList.DataFolderPath, file);
+            }
+        }
 
         void TopicIDChange(object sender, TextChangedEventArgs e) {
             TextBox box = (TextBox)sender;

diff --git a/TriviaMurderPartyModder/MainWindow.WorstDrawing.cs b/TriviaMurderPartyModder/MainWindow.WorstDrawing.cs
@@ -16,7 +16,7 @@ void WorstDrawingImportLastSave(object _, RoutedEventArgs e) =>
         void WorstDrawingReleaseCheck(object _, RoutedEventArgs e) => ReleaseCheck(worstDrawingList);
         void WorstDrawingAudio(object _, RoutedEventArgs e) =>
             ((WorstDrawing)worstDrawings.SelectedItem).ImportAudio(worstDrawingList.DataFolderPath,
-                LoadAudio(questions, questionList));
+                LoadAudio(worstDrawings, worstDrawingList));
         void WorstDrawingRemove(object _, RoutedEventArgs e) => RemoveElement(worstDrawings, worstDrawingList);
     }
 }
diff --git a/TriviaMurderPartyModder/MainWindow.WorstResponse.cs b/TriviaMurderPartyModder/MainWindow.WorstResponse.cs
@@ -16,7 +16,7 @@ void WorstResponseImportLastSave(object _, RoutedEventArgs e) =>
         void WorstResponseReleaseCheck(object _, RoutedEventArgs e) => ReleaseCheck(worstResponseList);
         void WorstResponseAudio(object _, RoutedEventArgs e) =>
             ((WorstResponse)worstResponses.SelectedItem).ImportAudio(worstResponseList.DataFolderPath,
-                LoadAudio(questions, questionList));
+                LoadAudio(worstResponses, worstResponseList));
         void WorstResponseRemove(object _, RoutedEventArgs e) => RemoveElement(worstResponses, worstResponseList);
     }
 }
diff --git a/TriviaMurderPartyModder/MainWindow.xaml.cs b/TriviaMurderPartyModder/MainWindow.xaml.cs
@@ -92,6 +92,18 @@ string LoadAudio<T>(DataGrid grid, DataFile<T> list) {
                 list.Issue(Properties.Resources.noAudioImportSelection);
                 return null;
             }
+            return FinalizeLoadAudio(list);
+        }
+
+        string LoadAudio<T>(TreeView tree, DataFile<T> list) {
+            if (tree.SelectedItem == null) {
+                list.Issue(Properties.Resources.noAudioImportSelection);
+                return null;
+            }
+            return FinalizeLoadAudio(list);
+        }
+
+        string FinalizeLoadAudio<T>(DataFile<T> list) {
             if (list.FileName == null) {
                 list.Issue(Properties.Resources.noSavedFile);
                 return null;

diff --git a/TriviaMurderPartyModder/Properties/AssemblyInfo.cs b/TriviaMurderPartyModder/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]