Mercurial Repositories > eric / changeset

--- a/eric6/Debugger/DebuggerInterfacePython.py	Sat Feb 22 14:27:42 2020 +0100
+++ b/eric6/Debugger/DebuggerInterfacePython.py	Sun Feb 23 13:19:20 2020 +0100
@@ -519,11 +519,12 @@
         """
         Public slot to flush the queue.
         """
-        # Send commands that were waiting for the connection.
-        for cmd in self.queue:
-            self.__writeJsonCommandToSocket(cmd)
-        
-        self.queue = []
+        if self.qsock is not None:
+            # Send commands that were waiting for the connection.
+            for cmd in self.queue:
+                self.__writeJsonCommandToSocket(cmd)
+            
+            self.queue = []
     
     def shutdown(self):
         """

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 22 14:27:42 2020 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Feb 23 13:19:20 2020 +0100
@@ -3179,19 +3179,21 @@
         args.append('paths')
         
         output, error = self.__client.runcommand(args)
+        print(output, error)
         
         self.__defaultConfigured = False
         self.__defaultPushConfigured = False
         if output:
             for line in output.splitlines():
+                line = line.strip()
                 if (
                     line.startswith("paths.default=") and
-                    not line.strip().endswith("=")
+                    not line.endswith("=")
                 ):
                     self.__defaultConfigured = True
                 if (
                     line.startswith("paths.default-push=") and
-                    not line.strip().endswith("=")
+                    not line.endswith("=")
                 ):
                     self.__defaultPushConfigured = True