From 73a3d5ea2593ee96a6201fc88b4b0c50060f5e29 Mon Sep 17 00:00:00 2001
From: inpos <inpos@yandex.ru>
Date: Thu, 17 Mar 2016 19:32:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Anteoloader.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Anteoloader.py b/Anteoloader.py
index c42e5bf..a2c60eb 100644
--- a/Anteoloader.py
+++ b/Anteoloader.py
@@ -165,23 +165,16 @@ class AnteoLoader:
         self.setup_engine()
         files = []
         filelist = []
-<<<<<<< HEAD
-        with closing(self.engine):
-            #self.engine.start()
-=======
         try:
             self.engine.start()
->>>>>>> 1974c5a41ad9cbfa5eb82d5848e79387701b9c92
             #media_types=[MediaType.VIDEO, MediaType.AUDIO, MediaType.SUBTITLES, MediaType.UNKNOWN]
 
             iterator = 0
             text = Localization.localize('Magnet-link is converting') if self.magnetLink\
                 else Localization.localize('Opening torrent file')
             while not files and not xbmc.abortRequested and iterator < 100:
-                #files = self.engine.list()
-                files = self.engine.list_from_info()
-                #self.engine.check_torrent_error()
-                if len(files) == 0: break
+                files = self.engine.list()
+                self.engine.check_torrent_error()
                 if iterator==4:
                     progressBar = xbmcgui.DialogProgress()
                     progressBar.create(Localization.localize('Please Wait'),