Project/Project.py

changeset 2318
3a3ee7cc2ad6
parent 2302
f29e9405c851
child 2319
116c547dedce
diff -r ac7ffbf5b36b -r 3a3ee7cc2ad6 Project/Project.py
--- a/Project/Project.py	Mon Jan 07 15:34:36 2013 +0100
+++ b/Project/Project.py	Mon Jan 07 16:34:02 2013 +0100
@@ -2251,9 +2251,10 @@
                 # stop the VCS monitor thread and shutdown VCS
                 if self.vcs is not None:
                     self.vcs.stopStatusMonitor()
-                    self.vcs.vcsStatusMonitorData.disconnect(self.__model.changeVCSStates)
-                    self.vcs.vcsStatusMonitorStatus.disconnect(self.__statusMonitorStatus)
+##                    self.vcs.vcsStatusMonitorData.disconnect(self.__model.changeVCSStates)
+##                    self.vcs.vcsStatusMonitorStatus.disconnect(self.__statusMonitorStatus)
                     self.vcs.vcsShutdown()
+                    self.vcs.deleteLater()
                     self.vcs = None
                     e5App().getObject("PluginManager").deactivateVcsPlugins()
                 # reinit VCS
@@ -2614,16 +2615,16 @@
         # stop the VCS monitor thread
         if self.vcs is not None:
             self.vcs.stopStatusMonitor()
-            try:
-                self.vcs.vcsStatusMonitorData.disconnect(
-                    self.__model.changeVCSStates)
-            except TypeError:
-                pass
-            try:
-                self.vcs.vcsStatusMonitorStatus.disconnect(
-                    self.__statusMonitorStatus)
-            except TypeError:
-                pass
+##            try:
+##                self.vcs.vcsStatusMonitorData.disconnect(
+##                    self.__model.changeVCSStates)
+##            except TypeError:
+##                pass
+##            try:
+##                self.vcs.vcsStatusMonitorStatus.disconnect(
+##                    self.__statusMonitorStatus)
+##            except TypeError:
+##                pass
         
         # now save the tasks
         if not noSave:
@@ -2634,6 +2635,7 @@
         # now shutdown the vcs interface
         if self.vcs:
             self.vcs.vcsShutdown()
+            self.vcs.deleteLater()
             self.vcs = None
             e5App().getObject("PluginManager").deactivateVcsPlugins()
         

eric ide

mercurial