jellyfin/Swiftfin
1
0
Fork 0
mirror of https://github.com/jellyfin/Swiftfin.git synced 2024-12-04 12:23:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix orientation being null, crash

Browse Source
This commit is contained in:
Aiden Vigue 2021-08-15 13:12:16 -04:00
parent 01f4693286
commit 3ac9766394
No known key found for this signature in database
GPG Key ID: B9A09843AB079D5B
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/Flight-School/AnyCodable",
"state": {
"branch": null,
"revision": "876d162385e9862ae8b3c8d65dc301312b040005",
"version": "0.6.0"
"revision": "69261f239f0fffaf51495dadc4f8483fbfe97025",
"version": "0.6.1"
}
},
{
@ -60,7 +60,7 @@
"repositoryURL": "https://github.com/jellyfin/jellyfin-sdk-swift",
"state": {
"branch": "main",
"revision": "5cdc2419f547b3f31dc96f5eccaf3f303f44184b",
"revision": "f315671ced976a7ec75ce6a1f37e00b4880cbf4b",
"version": null
}
},
@ -78,8 +78,8 @@
"repositoryURL": "https://github.com/kean/Nuke.git",
"state": {
"branch": null,
"revision": "69ae6d5b8c4b898450432f94bd35f863d3830cfc",
"version": "10.3.0"
"revision": "3bd3a1765bdf62d561d4c2e10e1c4fc7a010f44e",
"version": "10.3.2"
}
},
{
@ -105,8 +105,8 @@
"repositoryURL": "https://github.com/sushichop/Puppy",
"state": {
"branch": null,
"revision": "dc82e65c749cee431ffbb8c0913680b61ccd7e08",
"version": "0.2.0"
"revision": "d670c669ce2a6ab554a903b815f461d6efc565e4",
"version": "0.3.0"
}
},
{
@ -150,8 +150,8 @@
"repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state": {
"branch": null,
"revision": "152390e9e78ebbf0d767ee52971d41e7f44f39bc",
"version": "0.1.1"
"revision": "b9eeb1a7ea3fd6fea54ce57dee2f5794b667c8df",
"version": "0.2.0"
}
}
]

22
JellyfinPlayer/VideoPlayer.swift
View File

@ -81,7 +81,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
var playbackItem = PlaybackItem()
var remoteTimeUpdateTimer: Timer?
var upNextViewModel: UpNextViewModel = UpNextViewModel()
var lastOri: UIInterfaceOrientation!
var lastOri: UIInterfaceOrientation? = nil
// MARK: IBActions
@IBAction func seekSliderStart(_ sender: Any) {
@ -398,12 +398,14 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
}
DispatchQueue.main.async {
self.lastOri = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation
self.lastOri = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation ?? nil
AppDelegate.orientationLock = .landscape
if !self.lastOri.isLandscape {
UIDevice.current.setValue(UIInterfaceOrientation.landscapeRight.rawValue, forKey: "orientation")
UIViewController.attemptRotationToDeviceOrientation()
if(self.lastOri != nil) {
if !self.lastOri!.isLandscape {
UIDevice.current.setValue(UIInterfaceOrientation.landscapeRight.rawValue, forKey: "orientation")
UIViewController.attemptRotationToDeviceOrientation()
}
}
}
@ -451,9 +453,11 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
self.navigationController?.isNavigationBarHidden = false
overrideUserInterfaceStyle = .unspecified
DispatchQueue.main.async {
AppDelegate.orientationLock = .all
UIDevice.current.setValue(self.lastOri.rawValue, forKey: "orientation")
UIViewController.attemptRotationToDeviceOrientation()
if(self.lastOri != nil) {
AppDelegate.orientationLock = .all
UIDevice.current.setValue(self.lastOri!.rawValue, forKey: "orientation")
UIViewController.attemptRotationToDeviceOrientation()
}
}
}