Merged remote changes.

Wed, 01 May 2013 14:48:23 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 01 May 2013 14:48:23 +0200
changeset 2641
54449eeec336
parent 2640
dedcd4f987e0 (current diff)
parent 2636
f3dd3c8d4aa4 (diff)
child 2642
c9f965bd21d2

Merged remote changes.

--- a/DebugClients/Python/DebugClientBase.py	Wed May 01 14:47:38 2013 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Wed May 01 14:48:23 2013 +0200
@@ -1231,6 +1231,9 @@
         @param scope 1 to report global variables, 0 for local variables (int)
         @param filter the indices of variable types to be filtered (list of int)
         """
+        if self.currentThread is None:
+            return
+        
         if scope == 0:
             self.framenr = frmnr
         
@@ -1270,6 +1273,9 @@
         @param scope 1 to report global variables, 0 for local variables (int)
         @param filter the indices of variable types to be filtered (list of int)
         """
+        if self.currentThread is None:
+            return
+        
         f = self.currentThread.getCurrentFrame()
         
         while f is not None and frmnr > 0:
--- a/DebugClients/Python3/DebugClientBase.py	Wed May 01 14:47:38 2013 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Wed May 01 14:48:23 2013 +0200
@@ -1241,6 +1241,9 @@
         @param scope 1 to report global variables, 0 for local variables (int)
         @param filter the indices of variable types to be filtered (list of int)
         """
+        if self.currentThread is None:
+            return
+        
         if scope == 0:
             self.framenr = frmnr
         
@@ -1280,6 +1283,9 @@
         @param scope 1 to report global variables, 0 for local variables (int)
         @param filter the indices of variable types to be filtered (list of int)
         """
+        if self.currentThread is None:
+            return
+        
         f = self.currentThread.getCurrentFrame()
         
         while f is not None and frmnr > 0:

eric ide

mercurial