Merge branch 'master' into master

This commit is contained in:
Etoh 2020-06-18 20:47:17 +01:00 committed by GitHub
commit 547451cd31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -1,2 +1,2 @@
pyside2>=5.11.0
requests>=2.20.0; sys_platform == 'darwin'
pyside2>=5.11.0,<5.15
requests>=2.20.0; sys_platform == 'darwin'

View File

@ -667,7 +667,7 @@ class MpvPlayer(BasePlayer):
self.sendQueue.remove(self.sendQueue[itemID])
except UnicodeWarning:
self.__playerController._client.ui.showDebugMessage(
"<mpv> Unicode mismatch occured when trying to remove duplicate")
"<mpv> Unicode mismatch occurred when trying to remove duplicate")
# TODO: Prevent this from being triggered
pass
break