diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-12-02 13:45:28 -0800 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-12-02 13:45:28 -0800 |
| commit | 75ed023c288147870222d25c53bcfc24425e274f (patch) | |
| tree | 2d9d81aec08d8ece6e67301ade7accaae33e5358 | |
| parent | 251d3953dfde97517eb18467df2ee4bc439e4063 (diff) | |
| parent | 23bffeaee444ec972634f61ea96932e71654e4f0 (diff) | |
| download | sdl_ios-75ed023c288147870222d25c53bcfc24425e274f.tar.gz | |
Merge remote-tracking branch 'origin/master' into release/4.5.0
* origin/master:
Revert waypoints
Revert "Merge pull request #476 from smartdevicelink/hotfix/issue_475"
Revert "Added tests for SDLNotificationDispatcher's new methods, and updated them to match changed classnames."
Added tests for SDLNotificationDispatcher's new methods, and updated them to match changed classnames.
Fixing issue relating to classes being incorrectly spelled compared to spec (which is incorrectly spelled).
Added in missing response & notification dispatchers for waypoints.
Added check for compressionSession nullability.
| -rw-r--r-- | SmartDeviceLink/SDLNotificationDispatcher.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLStreamingMediaManager.m | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m index 48b9f525f..10e553f6c 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.m +++ b/SmartDeviceLink/SDLNotificationDispatcher.m @@ -310,4 +310,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END
\ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m index df61205f4..ee64109c3 100644 --- a/SmartDeviceLink/SDLStreamingMediaManager.m +++ b/SmartDeviceLink/SDLStreamingMediaManager.m @@ -343,8 +343,10 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark Lifecycle - (void)sdl_teardownCompressionSession { - VTCompressionSessionInvalidate(self.compressionSession); - CFRelease(self.compressionSession); + if (self.compressionSession != NULL) { + VTCompressionSessionInvalidate(self.compressionSession); + CFRelease(self.compressionSession); + } } |