Merge branch 'master' of github.com:limelight-stream/limelight-ios

This commit is contained in:
Cameron Gutman 2015-01-09 18:02:42 -05:00
commit d92edc19df

View File

@ -58,6 +58,7 @@
} }
- (void)edgeSwiped { - (void)edgeSwiped {
NSLog(@"User swiped to end stream");
[_streamMan stopStream]; [_streamMan stopStream];
[self returnToMainFrame]; [self returnToMainFrame];
} }
@ -82,12 +83,14 @@
- (void)connectionTerminated:(long)errorCode { - (void)connectionTerminated:(long)errorCode {
NSLog(@"Connection terminated: %ld", errorCode); NSLog(@"Connection terminated: %ld", errorCode);
UIAlertController* conTermAlert = [UIAlertController alertControllerWithTitle:@"Connection Terminated" message:@"The connection was terminated" preferredStyle:UIAlertControllerStyleAlert]; dispatch_async(dispatch_get_main_queue(), ^{
[conTermAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){ UIAlertController* conTermAlert = [UIAlertController alertControllerWithTitle:@"Connection Terminated" message:@"The connection was terminated" preferredStyle:UIAlertControllerStyleAlert];
[self returnToMainFrame]; [conTermAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
}]]; [self returnToMainFrame];
[self presentViewController:conTermAlert animated:YES completion:nil]; }]];
[self presentViewController:conTermAlert animated:YES completion:nil];
});
[_streamMan stopStreamInternal]; [_streamMan stopStreamInternal];
} }