fix uninitialized variable without instrumentals tagfix uninitialized

variable without instrumentals tag
UltraStar-Deluxe · Jul 25, 2024 · 19b09aa · 19b09aa
1 parent bcf6164
commit 19b09aa
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/base/USong.pas b/src/base/USong.pas
@@ -878,9 +878,10 @@ function TSong.ReadTXTHeader(SongFile: TTextFileStream; ReadCustomTags: Boolean)
         if (Self.Path.Append(EncFile).IsFile) then
         begin
           self.Mp3 := EncFile;
-          if self.Karaoke = PATH_NONE() then
+          if (not Assigned(self.Karaoke)) or (self.Karaoke = PATH_NONE()) then
+          begin
             self.Karaoke := EncFile;
-
+          end;
           //Add Mp3 Flag to Done
           Done := Done or 4;
         end
@@ -940,11 +941,11 @@ function TSong.ReadTXTHeader(SongFile: TTextFileStream; ReadCustomTags: Boolean)
       end
 
       // Karaoke Mp3
-      else if Identifier = 'INSTRUMENTAL' then
+      else if (Identifier = 'INSTRUMENTAL') then
       begin
         EncFile := DecodeFilename(Value);
         if (self.Path.Append(EncFile).IsFile) then
-          self.Karaoke := EncFile
+          self.Karaoke := EncFile;
       end
 
       // Video Gap