Merge pull request #339 from vim-vdebug/issue-335-lockup-when-closing-without-hitting-breakpoint

Issue 335 lockup when closing without hitting breakpoint

Author: BlackIkeEagle

pythonx/vdebug/connection.py

@@ -181,6 +181,7 @@ def run(self):
             s.setblocking(1)
             s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             s.bind((self.__host, self.__port))
+            s.settimeout(5) # timeout after 5 seconds so we can check messages
             s.listen(5)
             while 1:
                 try:
@@ -201,7 +202,7 @@ def run(self):
 
     def __peek_for_exit(self):
         try:
-            #self.log("Checking for exit")
+            # self.log("Checking for exit")
             self.__check_exit(self.__message_q.get_nowait())
         except queue.Empty:
             pass

pythonx/vdebug/session.py

@@ -57,6 +57,9 @@ def stop_listening(self):
             self.listener.stop()
             self.ui().say("Vdebug stopped waiting for a connection")
 
+        if self.__session:
+            self.__session.close_connection()
+
     def run(self):
         if self.is_connected():
             self.dispatch_event("run")
@@ -66,11 +69,10 @@ def run(self):
     def stop(self):
         if self.is_connected():
             self.__session.close_connection()
-        elif self.is_open():
+        elif self.is_listening():
             self.stop_listening()
+        elif self.is_open():
             self.__ui.close()
-        elif self.is_listening():
-            self.listener.stop()
         else:
             self.__ui.say("Vdebug is not running")