Explorar o código

Fix format-string mixup between Episode and Season numbers (close #9454)

Felix Paul Kühne %!s(int64=11) %!d(string=hai) anos
pai
achega
18056db087

+ 2 - 2
AspenProject/VLCPlaylistGridView.m

@@ -193,10 +193,10 @@
     MLFile *anyFileFromEpisode = showEpisode.files.anyObject;
     self.titleLabel.text = showEpisode.name;
     if (self.titleLabel.text.length < 1) {
-        self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue];
+        self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue];
         self.subtitleLabel.text = [NSString stringWithFormat:@"%@", [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
     } else
-        self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
+        self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
 
     CGFloat position = anyFileFromEpisode.lastPosition.floatValue;
     self.progressView.progress = position;

+ 2 - 2
AspenProject/VLCPlaylistTableViewCell.m

@@ -164,10 +164,10 @@
 
     MLFile *anyFileFromEpisode = showEpisode.files.anyObject;
     if (self.titleLabel.text.length < 1) {
-        self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue];
+        self.titleLabel.text = [NSString stringWithFormat:@"S%02dE%02d", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue];
         self.subtitleLabel.text = [NSString stringWithFormat:@"%@", [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
     } else
-        self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.episodeNumber.intValue, showEpisode.seasonNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
+        self.subtitleLabel.text = [NSString stringWithFormat:@"S%02dE%02d — %@", showEpisode.seasonNumber.intValue, showEpisode.episodeNumber.intValue, [VLCTime timeWithNumber:[anyFileFromEpisode duration]]];
 
     CGFloat position = anyFileFromEpisode.lastPosition.floatValue;
     self.progressIndicator.progress = position;