Merged remote changes. 6_1_x

Fri, 01 Jan 2016 12:14:06 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 01 Jan 2016 12:14:06 +0100
branch
6_1_x
changeset 4633
4e6f5de766ff
parent 4632
ca310db386ed (current diff)
parent 4628
ce2ea583de98 (diff)
child 4634
75ba4ce4a589

Merged remote changes.

PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
--- a/PluginManager/PluginManager.py	Fri Jan 01 12:13:13 2016 +0100
+++ b/PluginManager/PluginManager.py	Fri Jan 01 12:14:06 2016 +0100
@@ -1148,6 +1148,7 @@
                 ).format(Preferences.getUI("PluginRepositoryUrl6"),
                          reply.errorString())
             )
+            reply.deleteLater()
             return
         
         ioDevice = QFile(self.pluginRepositoryFile + ".tmp")
@@ -1157,6 +1158,7 @@
         if QFile.exists(self.pluginRepositoryFile):
             QFile.remove(self.pluginRepositoryFile)
         ioDevice.rename(self.pluginRepositoryFile)
+        reply.deleteLater()
         
         if os.path.exists(self.pluginRepositoryFile):
             f = QFile(self.pluginRepositoryFile)
--- a/PluginManager/PluginRepositoryDialog.py	Fri Jan 01 12:13:13 2016 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Fri Jan 01 12:14:06 2016 +0100
@@ -453,6 +453,7 @@
                         len(self.__selectedItems()))
                     self.__downloadInstallButton.setEnabled(
                         len(self.__selectedItems()))
+            reply.deleteLater()
             return
         
         self.__downloadIODevice.open(QIODevice.WriteOnly)
@@ -463,6 +464,7 @@
         self.__downloadIODevice.rename(self.__downloadFileName)
         self.__downloadIODevice = None
         self.__downloadURL = None
+        reply.deleteLater()
         
         if self.__doneMethod is not None:
             self.__doneMethod(ok, self.__downloadFileName)

eric ide

mercurial