Skip to content

Commit 023cf10

Browse files
committed
Merge branch 'release/0.2.44'
2 parents 91a6adf + 0d127ff commit 023cf10

File tree

3 files changed

+90
-73
lines changed

3 files changed

+90
-73
lines changed

ios/RNJWPlayer/RNJWPlayerView.swift

+12-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
3434
var settingConfig: Bool = false
3535
var pendingConfig: Bool = false
3636
var currentConfig: [String : Any]!
37+
var playerFailed = false
3738
var castController: JWCastController!
3839
var isCasting: Bool = false
3940
var availableDevices: [AnyObject]!
@@ -221,6 +222,12 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
221222
}
222223

223224
@objc func setConfig(_ config: [String: Any]) {
225+
if (playerFailed) {
226+
playerFailed = false
227+
setNewConfig(config: config)
228+
return
229+
}
230+
224231
// Create mutable copies of the dictionaries
225232
var configCopy = config
226233
var currentConfigCopy = currentConfig
@@ -319,7 +326,9 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
319326
}
320327

321328
@objc func setControls(_ controls:Bool) {
322-
self.toggleUIGroup(view: playerViewController.view, name: "JWPlayerKit.InterfaceView", ofSubview: nil, show: controls)
329+
if let playerViewControllerView = playerViewController?.view {
330+
self.toggleUIGroup(view: playerViewControllerView, name: "JWPlayerKit.InterfaceView", ofSubview: nil, show: controls)
331+
}
323332
}
324333

325334
// MARK: - RNJWPlayer styling
@@ -922,10 +931,12 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
922931

923932
func jwplayer(_ player:JWPlayer, failedWithError code:UInt, message:String) {
924933
self.onPlayerError?(["error": message])
934+
playerFailed = true
925935
}
926936

927937
func jwplayer(_ player:JWPlayer, failedWithSetupError code:UInt, message:String) {
928938
self.onSetupPlayerError?(["error": message])
939+
playerFailed = true
929940
}
930941

931942
func jwplayer(_ player:JWPlayer, encounteredWarning code:UInt, message:String) {

0 commit comments

Comments
 (0)