ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Завершение слияния

pull/8/head^2
inpos 2016-03-20 13:49:26 +03:00
parent 6aea5b27e3
commit d51726605d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Inposloader.py
View File

@ -248,15 +248,9 @@ class InposPlayer(xbmc.Player):
try: try:
self.engine.start() self.engine.start()
self.setup_nextep() self.setup_nextep()
<<<<<<< HEAD
while True:
self.engine.activate_file(self.contentId)
if self.buffer():
=======
self.engine.activate_file(self.contentId) self.engine.activate_file(self.contentId)
if self.buffer(): if self.buffer():
while True: while True:
>>>>>>> 337de1c95f0872a9223a8008698caf9099137ff7
log('['+author+'Player]: ************************************* GOING LOOP') log('['+author+'Player]: ************************************* GOING LOOP')
if self.setup_play(): if self.setup_play():
self.setup_subs() self.setup_subs()