moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-02-16 10:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a semaphore to ensure the loading frame is safely shown and dismissed

Browse Source
This commit is contained in:
Cameron Gutman
2018-12-28 02:01:40 -08:00
parent d40a29df71
commit c8adc184c9
1 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Limelight/ViewControllers/MainFrameViewController.m
View File

@@ -48,6 +48,7 @@
NSArray* _sortedAppList;
NSCache* _boxArtCache;
bool _background;
dispatch_semaphore_t _loadingFrameSemaphore;
#if TARGET_OS_TV
UITapGestureRecognizer* _menuRecognizer;
#else
@@ -662,22 +663,66 @@ static NSMutableSet* hostList;
}
- (void) showLoadingFrame:(void (^)(void))completion {
// Avoid animating this as it significantly prolongs the loading frame's
// time on screen and can lead to warnings about dismissing while it's
// still animating.
[[self activeViewController] presentViewController:_loadingFrame animated:NO completion:completion];
// Wait for all loading frame operations to complete before starting this one
dispatch_semaphore_wait(_loadingFrameSemaphore, DISPATCH_TIME_FOREVER);
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already active, just complete it now otherwise
// we may not get a completion callback.
if ([self activeViewController] == self->_loadingFrame) {
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
return;
}
// Avoid animating this as it significantly prolongs the loading frame's time on screen
[[self activeViewController] presentViewController:self->_loadingFrame animated:NO completion:^{
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
}];
});
});
}
- (void) hideLoadingFrame:(void (^)(void))completion {
// See comment above in showLoadingFrame about why we don't animate this
[_loadingFrame dismissViewControllerAnimated:NO completion:completion];
[self enableNavigation];
// Wait for all loading frame operations to complete before starting this one
dispatch_semaphore_wait(_loadingFrameSemaphore, DISPATCH_TIME_FOREVER);
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already dismissed, just complete it now otherwise
// we may not get a completion callback.
if ([self activeViewController] != self->_loadingFrame) {
[self enableNavigation];
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
return;
}
// See comment above in showLoadingFrame about why we don't animate this
[self->_loadingFrame dismissViewControllerAnimated:NO completion:^{
[self enableNavigation];
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
}];
});
});
}
- (void)viewDidLoad
{
[super viewDidLoad];
// Ensure only one loading frame operation can take place at a time
_loadingFrameSemaphore = dispatch_semaphore_create(1);
#if !TARGET_OS_TV
// Set the side bar button action. When it's tapped, it'll show the sidebar.
[_limelightLogoButton addTarget:self.revealViewController action:@selector(revealToggle:) forControlEvents:UIControlEventTouchDown];