summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2017-02-07 17:57:37 -0500
committerGitHub <noreply@github.com>2017-02-07 17:57:37 -0500
commit4aed70aa1c6ab316bb7c953ad4a7df481f9530ca (patch)
tree05bb6c12120a24036306ab6c4c5583bb2680cd97
parent749c4ea4a606f163bacf2d8c7ab7f351c53fb2e0 (diff)
parent54c414e391a5d3d0203e10a6f54cafda9bb9d3fb (diff)
downloadsdl_ios-4aed70aa1c6ab316bb7c953ad4a7df481f9530ca.tar.gz
Merge pull request #521 from smartdevicelink/hotfix/issue_520_streaming_object_throw_error
Fixed issue with throwing instead of returning nil in SDLProxy's streamingMediaManager
-rw-r--r--SmartDeviceLink/SDLProxy.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 58ee557c7..341d19f9c 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -182,7 +182,7 @@ const int POLICIES_CORRELATION_ID = 65535;
- (SDLStreamingMediaManager *)streamingMediaManager {
if (_streamingMediaManager == nil) {
if (self.displayCapabilities == nil) {
- @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"SDLStreamingMediaManager must be accessed only after a successful RegisterAppInterfaceResponse" userInfo:nil];
+ return nil;
}
_streamingMediaManager = [[SDLStreamingMediaManager alloc] initWithProtocol:self.protocol displayCapabilities:self.displayCapabilities];
[self.protocol.protocolDelegateTable addObject:_streamingMediaManager];