From 7baaf963c9af6a8b546816b8087b8bca2f8dfba5 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 25 Jul 2014 19:45:52 +0200 Subject: [PATCH] (iOS) Make wasSelectedonTableView more robust --- apple/iOS/menu.m | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 82aa928a21..c3188d4458 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -255,11 +255,17 @@ static void RunActionSheet(const char* title, const struct string_list* items, U - (void)wasSelectedOnTableView:(UITableView*)tableView ofController:(UIViewController*)controller { char buffer[256]; - UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:BOXSTRING("Enter new value") message:BOXSTRING(self.setting->short_description) delegate:self - cancelButtonTitle:BOXSTRING("Cancel") otherButtonTitles:BOXSTRING("OK"), nil]; + NSString *desc = BOXSTRING("N/A"); + UIAlertView *alertView; + UITextField *field; + + if (self.setting && self.setting->short_description) + desc = BOXSTRING(self.setting->short_description); + + alertView = [[UIAlertView alloc] initWithTitle:BOXSTRING("Enter new value") message:desc delegate:self cancelButtonTitle:BOXSTRING("Cancel") otherButtonTitles:BOXSTRING("OK"), nil]; alertView.alertViewStyle = UIAlertViewStylePlainTextInput; - UITextField* field = [alertView textFieldAtIndex:0]; + field = [alertView textFieldAtIndex:0]; field.delegate = self.formatter; field.placeholder = BOXSTRING(setting_data_get_string_representation(self.setting, buffer, sizeof(buffer)));