cope with pressing esq when entering client cmd

diff --git a/StatusFrame.py b/StatusFrame.py
index 37f7bbf30bae3f51dbaf84c4427dcdd840b27dba..7fc80836aab8ce0339054718e219157fe40b70d6 100644 (file)
--- a/StatusFrame.py
+++ b/StatusFrame.py
@@ -19,7 +19,7 @@ class StatusFrame (gtk.Frame):
        def fillConfiguration(self, conf):
                raise NotImplemented()
 
-       def updateValues(self, pos):
+       def updateValues(self, status, param):
                raise NotImplemented()
 
 

diff --git a/pygdb.vim b/pygdb.vim
index 642b327f7c5d545bc5c1d431d395d88ce1967f50..b02495ad079d52f81d0ee4a7306047c6d61f1c3a 100644 (file)
--- a/pygdb.vim
+++ b/pygdb.vim
@@ -37,7 +37,15 @@ execsign = None
 def gdbLaunch():
        global gdbBps, clientcmd
 
-       clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd).strip()
+       clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd)
+       
+       #Pressed esq?
+       if clientcmd == None:
+               clientcmd = ""
+               return
+
+       #Strip away white space
+       clientcmd = clientcmd.strip()
 
        if clientcmd.strip()=="":
                print "No command given!"
@@ -205,7 +213,12 @@ def toAbsPath(path):
 
                #We need the client command to expand the paths...
                while clientcmd == "" or not cmdset:
-                       clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd).strip()
+                       clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd)
+
+                       if clientcmd == None:
+                               clientcmd = ""
+                       clientcmd = clientcmd.strip()
+
                        cmdset = True
 
                #Get the dirs where executeable is in