Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #859 from croneter/fix-crash

Browse source 
Hopefully fix Kodi crashing on playback startup for good
This commit is contained in:
croneter 2019-05-29 21:10:35 +02:00 committed by GitHub
commit 9684540189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
addon.xml
View file

@ -4,8 +4,8 @@
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.9.1" /> <import addon="script.module.requests" version="2.9.1" />
<import addon="script.module.defusedxml" version="0.5.0"/> <import addon="script.module.defusedxml" version="0.5.0"/>
<import addon="plugin.video.plexkodiconnect.movies" version="2.0.9" /> <import addon="plugin.video.plexkodiconnect.movies" version="2.1.0" />
<import addon="plugin.video.plexkodiconnect.tvshows" version="2.0.10" /> <import addon="plugin.video.plexkodiconnect.tvshows" version="2.1.0" />
</requires> </requires>
<extension point="xbmc.python.pluginsource" library="default.py"> <extension point="xbmc.python.pluginsource" library="default.py">
<provides>video audio image</provides> <provides>video audio image</provides>

12
resources/lib/playback.py
View file

@ -7,6 +7,8 @@ from __future__ import absolute_import, division, unicode_literals
from logging import getLogger from logging import getLogger
from threading import Thread from threading import Thread
import xbmc
from .plex_api import API from .plex_api import API
from .plex_db import PlexDB from .plex_db import PlexDB
from . import plex_functions as PF from . import plex_functions as PF
@ -163,11 +165,21 @@ def _playback_init(plex_id, plex_type, playqueue, pos):
Playback setup if Kodi starts playing an item for the first time. Playback setup if Kodi starts playing an item for the first time.
""" """
LOG.info('Initializing PKC playback') LOG.info('Initializing PKC playback')
# Stop playback so we don't get an error message that the last item of the
# queue failed to play
app.APP.player.stop()
xml = PF.GetPlexMetadata(plex_id, reraise=True) xml = PF.GetPlexMetadata(plex_id, reraise=True)
if xml in (None, 401): if xml in (None, 401):
LOG.error('Could not get a PMS xml for plex id %s', plex_id) LOG.error('Could not get a PMS xml for plex id %s', plex_id)
_ensure_resolve(abort=True) _ensure_resolve(abort=True)
return return
if (xbmc.getCondVisibility('Window.IsVisible(Home.xml)') and
plex_type in v.PLEX_VIDEOTYPES and
playqueue.kodi_pl.size() > 1):
LOG.debug('Detected widget playback for videos')
# Need to clear playlist because playqueue.kodi_pl.size() could return
# more than one - since playback was initiated from the audio queue!
playqueue.clear()
if playqueue.kodi_pl.size() > 1: if playqueue.kodi_pl.size() > 1:
# Special case - we already got a filled Kodi playqueue # Special case - we already got a filled Kodi playqueue
try: try: