PythonDebugger: Fix bug preventing the stack trace from showing (Don't request polling on dispatched commands until the last debug command of a group is sent)

spillz · spillz · commit a68a274c9522 · 2014-03-11T17:27:10.000-04:00
diff --git a/PythonDebugger/PythonDebugger.cpp b/PythonDebugger/PythonDebugger.cpp
@@ -147,17 +147,17 @@ void PythonDebugger::DispatchWatchCommands()
         wxString s;
         w->GetSymbol(s);
         command=_T("ps ")+s+_T("\n");
-        DispatchCommands(command,DBGCMDTYPE_WATCHEXPRESSION);
+        DispatchCommands(command,DBGCMDTYPE_WATCHEXPRESSION,false);
         if (w->IsExpanded())
         {
             command=_T("pm ")+s+_T("\n");
-            DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN);
+            DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN,false);
         }
     }
     if (m_locals_watch->IsExpanded())
     {
         command=_T("pl *Locals:\n");
-        DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN);
+        DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN,false);
     }
 }
 
@@ -705,8 +705,8 @@ void PythonDebugger::Stop()
 
 bool PythonDebugger::RunToCursor(const wxString& filename, int line, const wxString& line_text)
 {
-    if(filename!=m_curfile)
-        return false;
+//    if(filename!=m_curfile)
+//        return false;
     if(!m_DebuggerActive)
         return false;
     wxString sfile=filename;

Original file line number	Diff line number	Diff line change
`@@ -147,17 +147,17 @@ void PythonDebugger::DispatchWatchCommands()`
`147`	`147`	`wxString s;`
`148`	`148`	`w->GetSymbol(s);`
`149`	`149`	`command=_T("ps ")+s+_T("\n");`
`150`		`- DispatchCommands(command,DBGCMDTYPE_WATCHEXPRESSION);`
	`150`	`+ DispatchCommands(command,DBGCMDTYPE_WATCHEXPRESSION,false);`
`151`	`151`	`if (w->IsExpanded())`
`152`	`152`	`{`
`153`	`153`	`command=_T("pm ")+s+_T("\n");`
`154`		`- DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN);`
	`154`	`+ DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN,false);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`if (m_locals_watch->IsExpanded())`
`158`	`158`	`{`
`159`	`159`	`command=_T("pl *Locals:\n");`
`160`		`- DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN);`
	`160`	`+ DispatchCommands(command,DBGCMDTYPE_WATCHGETCHILDREN,false);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`@@ -705,8 +705,8 @@ void PythonDebugger::Stop()`
`705`	`705`
`706`	`706`	`bool PythonDebugger::RunToCursor(const wxString& filename, int line, const wxString& line_text)`
`707`	`707`	`{`
`708`		`- if(filename!=m_curfile)`
`709`		`- return false;`
	`708`	`+// if(filename!=m_curfile)`
	`709`	`+// return false;`
`710`	`710`	`if(!m_DebuggerActive)`
`711`	`711`	`return false;`
`712`	`712`	`wxString sfile=filename;`