Skip to content

Commit f497c7a

Browse files
committed
fixup: read key inside method
1 parent 2e79291 commit f497c7a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

XBMC Remote/SettingsValuesViewController.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ - (NSString*)getActionButtonTitle {
232232
subTitle = [NSString stringWithFormat:@": %@", settingOptions[longPressRow.row][@"label"]];
233233
break;
234234
case cSlider:
235-
stringFormat = [self getStringFormatFromItem:itemControls[@"formatlabel"] defaultFormat:stringFormat];
235+
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
236236
subTitle = [NSString stringWithFormat:stringFormat, (int)storeSliderValue];
237237
break;
238238
case cUnsupported:
@@ -344,9 +344,10 @@ - (void)retrieveXBMCData:(NSString*)method parameters:(NSDictionary*)params item
344344

345345
#pragma mark Helper
346346

347-
- (NSString*)getStringFormatFromItem:(NSString*)format defaultFormat:(NSString*)defaultFormat {
347+
- (NSString*)getStringFormatFromItem:(id)item defaultFormat:(NSString*)defaultFormat {
348348
// Workaround!! Before Kodi 18.x an older format ("%i ms") was used. The new format ("{0:d} ms") needs
349349
// an updated parser. Until this is implemented just display the value itself, without the unit.
350+
NSString *format = item[@"formatlabel"];
350351
if (format.length > 0 && AppDelegate.instance.serverVersion < 18) {
351352
return format;
352353
}
@@ -534,7 +535,7 @@ - (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSI
534535
slider.minimumValue = [self.detailItem[@"minimum"] intValue];
535536
slider.maximumValue = [self.detailItem[@"maximum"] intValue];
536537
slider.value = [self.detailItem[@"value"] intValue];
537-
stringFormat = [self getStringFormatFromItem:itemControls[@"formatlabel"] defaultFormat:stringFormat];
538+
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
538539
sliderLabel.text = [NSString stringWithFormat:stringFormat, [self.detailItem[@"value"] intValue]];
539540
break;
540541

@@ -795,7 +796,7 @@ - (void)sliderAction:(id)sender {
795796
if ([[[slider superview] viewWithTag:102] isKindOfClass:[UILabel class]]) {
796797
UILabel *sliderLabel = (UILabel*)[[slider superview] viewWithTag:102];
797798
NSString *stringFormat = @"%i";
798-
stringFormat = [self getStringFormatFromItem:itemControls[@"formatlabel"] defaultFormat:stringFormat];
799+
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
799800
sliderLabel.text = [NSString stringWithFormat:stringFormat, (int)storeSliderValue];
800801
}
801802
}

0 commit comments

Comments
 (0)