Merge pull request #868 from UltraStar-Deluxe/ignore-invalid-resolution

Ignore invalid #RESOLUTION
UltraStar-Deluxe · Jul 21, 2024 · 89f44e7 · 89f44e7
2 parents 026983a + a7b136b
commit 89f44e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/base/UFiles.pas b/src/base/UFiles.pas
@@ -150,7 +150,7 @@ function SaveSong(const Song: TSong; const Tracks: array of TLines; const Name:
       if Song.Video.IsSet              then    SongFile.WriteLine('#VIDEO:'       + EncodeToken(Song.Video.ToUTF8));
 
       if Song.VideoGAP    <> 0.0       then    SongFile.WriteLine('#VIDEOGAP:'    + FloatToStr(Song.VideoGAP));
-      if Song.Resolution  <> 4         then    SongFile.WriteLine('#RESOLUTION:'  + IntToStr(Song.Resolution));
+      if Song.Resolution  <> USong.DEFAULT_RESOLUTION then    SongFile.WriteLine('#RESOLUTION:'  + IntToStr(Song.Resolution));
       if Song.NotesGAP    <> 0         then    SongFile.WriteLine('#NOTESGAP:'    + IntToStr(Song.NotesGAP));
       if Song.Start       <> 0.0       then    SongFile.WriteLine('#START:'       + FloatToStr(Song.Start));
       if Song.Finish      <> 0         then    SongFile.WriteLine('#END:'         + IntToStr(Song.Finish));

diff --git a/src/base/USong.pas b/src/base/USong.pas
@@ -61,6 +61,9 @@ interface
   UUnicodeStringHelper,
   UUnicodeUtils;
 
+const
+  DEFAULT_RESOLUTION = 4; // default #RESOLUTION
+
 type
 
   TSingMode = ( smNormal, smPartyClassic, smPartyFree, smPartyChallenge, smPartyTournament, smJukebox, smPlaylistRandom , smMedley );
@@ -971,7 +974,11 @@ function TSong.ReadTXTHeader(SongFile: TTextFileStream; ReadCustomTags: Boolean)
       // Resolution
       else if (Identifier = 'RESOLUTION') then
       begin
-        TryStrtoInt(Value, self.Resolution)
+        TryStrtoInt(Value, self.Resolution);
+        if (self.Resolution < 1) then begin
+          Log.LogError('Ignoring invalid resolution in song: ' + FullFileName);
+          self.Resolution := DEFAULT_RESOLUTION;
+        end
       end
 
       // Notes Gap
@@ -1472,7 +1479,7 @@ procedure TSong.Clear();
   Video      := PATH_NONE;
   VideoGAP   := 0;
   NotesGAP   := 0;
-  Resolution := 4;
+  Resolution := DEFAULT_RESOLUTION;
   Creator    := '';
   PreviewStart := 0;
   CalcMedley := true;