From de5edb3cc208255303541e98044dfb8e70db9da9 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sun, 5 Nov 2023 00:08:18 -0400
Subject: [PATCH] Fix variation metadata and error message in
 ChartEditorImportExportHandler

---
 source/funkin/play/song/Song.hx                             | 6 +++---
 .../charting/handlers/ChartEditorImportExportHandler.hx     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/funkin/play/song/Song.hx b/source/funkin/play/song/Song.hx
index 01f0a5893..b48eda224 100644
--- a/source/funkin/play/song/Song.hx
+++ b/source/funkin/play/song/Song.hx
@@ -98,10 +98,10 @@ class Song implements IPlayStateScriptedClass implements IRegistryEntry<SongMeta
       for (vari in _data.playData.songVariations)
       {
         variations.push(vari);
-      }
 
-      for (meta in fetchVariationMetadata(id))
-        _metadata.set(meta.variation, meta);
+        var variMeta = fetchVariationMetadata(id, vari);
+        if (variMeta != null) _metadata.set(variMeta.variation, variMeta);
+      }
     }
 
     if (_metadata.size() == 0)
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
index 001caea8b..be850e93e 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
@@ -285,7 +285,7 @@ class ChartEditorImportExportHandler
         }
         else
         {
-          throw 'Could not load vocals ($playerCharId-$instId).';
+          throw 'Could not load vocals ($opponentCharId).';
         }
       }
     }