moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-06-17 22:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we don't deadlock if somehow a loading frame ends up under the active view

Browse Source
This commit is contained in:
Cameron Gutman
2018-12-28 02:09:57 -08:00
parent d466a0af07
commit 7c9313e04d
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/ViewControllers/MainFrameViewController.m
+16 -2
View File
@@ -383,6 +383,20 @@ static NSMutableSet* hostList;
return topController; return topController;
} }
- (BOOL) loadingFrameIsPresented {
UIViewController *nextController = [UIApplication sharedApplication].keyWindow.rootViewController;
while (nextController) {
if (nextController == _loadingFrame) {
return YES;
}
nextController = nextController.presentedViewController;
}
return NO;
}
- (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view { - (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view {
Log(LOG_D, @"Long clicked host: %@", host.name); Log(LOG_D, @"Long clicked host: %@", host.name);
UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet]; UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet];
@@ -669,7 +683,7 @@ static NSMutableSet* hostList;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already active, just complete it now otherwise // If loading frame is already active, just complete it now otherwise
// we may not get a completion callback. // we may not get a completion callback.
if ([self activeViewController] == self->_loadingFrame) { if ([self loadingFrameIsPresented]) {
dispatch_semaphore_signal(self->_loadingFrameSemaphore); dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) { if (completion) {
completion(); completion();
@@ -695,7 +709,7 @@ static NSMutableSet* hostList;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already dismissed, just complete it now otherwise // If loading frame is already dismissed, just complete it now otherwise
// we may not get a completion callback. // we may not get a completion callback.
if ([self activeViewController] != self->_loadingFrame) { if (![self loadingFrameIsPresented]) {
[self enableNavigation]; [self enableNavigation];
dispatch_semaphore_signal(self->_loadingFrameSemaphore); dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) { if (completion) {