iOS: ensure webserver notice can be dismissed (#17356)

This commit is contained in:
Eric Warmenhoven 2025-01-06 20:03:00 -05:00 committed by GitHub
parent 8a3f25311b
commit 69e8be6dc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -768,7 +768,6 @@ void cocoa_file_load_with_detect_core(const char *filename);
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Welcome to RetroArch" message:[NSString stringWithFormat:@"To transfer files from your computer, go to one of these addresses on your web browser:\n\n%@",servers] preferredStyle:UIAlertControllerStyleAlert]; UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Welcome to RetroArch" message:[NSString stringWithFormat:@"To transfer files from your computer, go to one of these addresses on your web browser:\n\n%@",servers] preferredStyle:UIAlertControllerStyleAlert];
#if TARGET_OS_TV
[alert addAction:[UIAlertAction actionWithTitle:@"OK" [alert addAction:[UIAlertAction actionWithTitle:@"OK"
style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
rarch_start_draw_observer(); rarch_start_draw_observer();
@ -778,10 +777,11 @@ void cocoa_file_load_with_detect_core(const char *filename);
rarch_start_draw_observer(); rarch_start_draw_observer();
configuration_set_bool(settings, settings->bools.gcdwebserver_alert, false); configuration_set_bool(settings, settings->bools.gcdwebserver_alert, false);
}]]; }]];
#elif TARGET_OS_IOS #if TARGET_OS_IOS
[alert addAction:[UIAlertAction actionWithTitle:@"Stop Server" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [alert addAction:[UIAlertAction actionWithTitle:@"Stop Server" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[WebServer sharedInstance] webUploader].delegate = nil; [[WebServer sharedInstance] webUploader].delegate = nil;
[[WebServer sharedInstance] stopServers]; [[WebServer sharedInstance] stopServers];
rarch_start_draw_observer();
}]]; }]];
#endif #endif
[self presentViewController:alert animated:YES completion:^{ [self presentViewController:alert animated:YES completion:^{