Replace depricated xbmc.abortRequested
This commit is contained in:
parent
d9d89f3e6c
commit
92a28b6eda
5 changed files with 10 additions and 11 deletions
|
@ -134,7 +134,7 @@ class App(object):
|
|||
thread.suspend(block=True)
|
||||
else:
|
||||
break
|
||||
return xbmc.abortRequested
|
||||
return xbmc.Monitor().abortRequested()
|
||||
|
||||
def resume_threads(self):
|
||||
"""
|
||||
|
@ -144,7 +144,7 @@ class App(object):
|
|||
LOG.debug('Resuming threads: %s', self.threads)
|
||||
for thread in self.threads:
|
||||
thread.resume()
|
||||
return xbmc.abortRequested
|
||||
return xbmc.Monitor().abortRequested()
|
||||
|
||||
def stop_threads(self, block=True):
|
||||
"""
|
||||
|
|
|
@ -305,7 +305,7 @@ class Task(object):
|
|||
self._canceled = True
|
||||
|
||||
def should_cancel(self):
|
||||
return self._canceled or xbmc.abortRequested
|
||||
return self._canceled or xbmc.Monitor().abortRequested()
|
||||
|
||||
def isValid(self):
|
||||
return not self.finished and not self._canceled
|
||||
|
@ -370,7 +370,7 @@ class BackgroundWorker(object):
|
|||
return self
|
||||
|
||||
def aborted(self):
|
||||
return self._abort or xbmc.abortRequested
|
||||
return self._abort or xbmc.Monitor().abortRequested()
|
||||
|
||||
def start(self):
|
||||
if self._thread and self._thread.isAlive():
|
||||
|
@ -452,7 +452,7 @@ class BackgroundThreader:
|
|||
return self
|
||||
|
||||
def aborted(self):
|
||||
return self._abort or xbmc.abortRequested
|
||||
return self._abort or xbmc.Monitor().abortRequested()
|
||||
|
||||
def shutdown(self, block=True):
|
||||
self.abort()
|
||||
|
|
|
@ -66,8 +66,7 @@ def _wait_for_auth():
|
|||
xbmcplugin.endOfDirectory(int(argv[1]), False) if failed
|
||||
|
||||
WARNING - this will potentially stall the shutdown of Kodi since we cannot
|
||||
poll xbmc.Monitor().abortRequested() or waitForAbort() or
|
||||
xbmc.abortRequested
|
||||
poll xbmc.Monitor().abortRequested() or waitForAbort()
|
||||
"""
|
||||
counter = 0
|
||||
startupdelay = int(utils.settings('startupDelay') or 0)
|
||||
|
|
|
@ -102,7 +102,7 @@ class Service(object):
|
|||
|
||||
@staticmethod
|
||||
def should_cancel():
|
||||
return xbmc.abortRequested or app.APP.stop_pkc
|
||||
return xbmc.Monitor().abortRequested() or app.APP.stop_pkc
|
||||
|
||||
def on_connection_check(self, result):
|
||||
"""
|
||||
|
|
|
@ -737,7 +737,7 @@ class MultiWindow(object):
|
|||
return mw
|
||||
|
||||
def _open(self):
|
||||
while not xbmc.abortRequested and not self._allClosed:
|
||||
while not xbmc.Monitor().abortRequested() and not self._allClosed:
|
||||
self._setupCurrent(self._next)
|
||||
self._current.modal()
|
||||
|
||||
|
@ -922,9 +922,9 @@ class PropertyTimer():
|
|||
self._callback()
|
||||
|
||||
def _wait(self):
|
||||
while not xbmc.abortRequested and time.time() < self._endTime:
|
||||
while not xbmc.Monitor().abortRequested() and time.time() < self._endTime:
|
||||
app.APP.monitor.waitForAbort(0.1)
|
||||
if xbmc.abortRequested:
|
||||
if xbmc.Monitor().abortRequested():
|
||||
return
|
||||
if self._endTime == 0:
|
||||
return
|
||||
|
|
Loading…
Reference in a new issue