Merge branch 'master' of https://github.com/spillz/codeblocks-python

spillz · spillz · commit b93bf17b5b66 · 2015-04-03T12:51:38.000-04:00
diff --git a/PythonDebugger/PythonDebugger.cpp b/PythonDebugger/PythonDebugger.cpp
@@ -252,10 +252,11 @@ void PythonDebugger::OnTimer(wxTimerEvent& event)
     {
         while(m_pp->IsInputAvailable())
         {
-            if(!m_istream->Eof())
-                m_outbuf+=m_istream->GetC();
-            else
-                break;
+            int c;
+            if (m_istream->CanRead())
+                c = m_istream->GetC();
+            if (m_istream->LastRead()>0)
+                m_outbuf += c;
         }
         //TODO: Program could hang if debug output is incorrectly parsed
         m_outdebugbuf=m_outbuf;

Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,11 @@ void PythonDebugger::OnTimer(wxTimerEvent& event)`
`252`	`252`	`{`
`253`	`253`	`while(m_pp->IsInputAvailable())`
`254`	`254`	`{`
`255`		`- if(!m_istream->Eof())`
`256`		`- m_outbuf+=m_istream->GetC();`
`257`		`- else`
`258`		`- break;`
	`255`	`+ int c;`
	`256`	`+ if (m_istream->CanRead())`
	`257`	`+ c = m_istream->GetC();`
	`258`	`+ if (m_istream->LastRead()>0)`
	`259`	`+ m_outbuf += c;`
`259`	`260`	`}`
`260`	`261`	`//TODO: Program could hang if debug output is incorrectly parsed`
`261`	`262`	`m_outdebugbuf=m_outbuf;`