Merge pull request #160 from oNaiPs/fix_ref_count_bugs

Use closure syntax for weak and unowned vars.
cordova-rtc · Apr 14, 2016 · ac4e857 · ac4e857
2 parents fcca647 + 4a4ffd6
commit ac4e857
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 68 deletions.
diff --git a/src/PluginRTCPeerConnection.swift b/src/PluginRTCPeerConnection.swift
@@ -137,7 +137,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 		let sdp = desc.objectForKey("sdp") as? String ?? ""
 		let rtcSessionDescription = RTCSessionDescription(type: type, sdp: sdp)
 
-		self.onSetDescriptionSuccessCallback = { () -> Void in
+		self.onSetDescriptionSuccessCallback = { [unowned self] () -> Void in
 			NSLog("PluginRTCPeerConnection#setLocalDescription() | success callback")
 
 			let data = [
@@ -175,7 +175,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 		let sdp = desc.objectForKey("sdp") as? String ?? ""
 		let rtcSessionDescription = RTCSessionDescription(type: type, sdp: sdp)
 
-		self.onSetDescriptionSuccessCallback = { () -> Void in
+		self.onSetDescriptionSuccessCallback = { [unowned self] () -> Void in
 			NSLog("PluginRTCPeerConnection#setRemoteDescription() | success callback")
 
 			let data = [
@@ -300,7 +300,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 	) {
 		NSLog("PluginRTCPeerConnection#RTCDataChannel_setListener()")
 
-		weak var pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
+		let pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
 
 		if pluginRTCDataChannel == nil {
 			return;
@@ -335,7 +335,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 			return
 		}
 
-		weak var pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
+		let pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
 
 		if pluginRTCDataChannel == nil {
 			return;
@@ -356,7 +356,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 			return
 		}
 
-		weak var pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
+		let pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
 
 		if pluginRTCDataChannel == nil {
 			return;
@@ -373,7 +373,7 @@ class PluginRTCPeerConnection : NSObject, RTCPeerConnectionDelegate, RTCSessionD
 			return
 		}
 
-		weak var pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
+		let pluginRTCDataChannel = self.pluginRTCDataChannels[dcId]
 
 		if pluginRTCDataChannel == nil {
 			return;