Helpviewer/OpenSearch/OpenSearchManager.py

branch
maintenance
changeset 6204
89dc65b937cc
parent 6121
d3d64f3128b3
child 6645
ad476851d7e0
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Sun Mar 04 14:52:32 2018 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Sun Mar 04 14:52:46 2018 +0100
@@ -417,31 +417,31 @@
         @param reply reference to the network reply
         @type QNetworkReply
         """
-        if reply.error() != QNetworkReply.NoError:
-            reply.close()
-            if reply in self.__replies:
-                self.__replies.remove(reply)
-            return
-        
-        from .OpenSearchReader import OpenSearchReader
-        reader = OpenSearchReader()
-        engine = reader.read(reply)
-        
         reply.close()
         if reply in self.__replies:
             self.__replies.remove(reply)
         
-        if not engine.isValid():
-            return
-        
-        if self.engineExists(engine.name()):
-            return
-        
-        if not self.__confirmAddition(engine):
-            return
-        
-        if not self.__addEngineByEngine(engine):
-            return
+        if reply.error() == QNetworkReply.NoError:
+            from .OpenSearchReader import OpenSearchReader
+            reader = OpenSearchReader()
+            engine = reader.read(reply)
+            
+            if not engine.isValid():
+                return
+            
+            if self.engineExists(engine.name()):
+                return
+            
+            if not self.__confirmAddition(engine):
+                return
+            
+            if not self.__addEngineByEngine(engine):
+                return
+        else:
+            # some error happened
+            from Helpviewer.HelpWindow import HelpWindow
+            HelpWindow.getWindow().statusBar().showMessage(
+                reply.errorString(), 10000)
     
     def convertKeywordSearchToUrl(self, keywordSearch):
         """

eric ide

mercurial