This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 72b4228abe583cd953491575cf42bae17ff5e9d2
Author: krzys-h <krzy...@interia.pl>
Date: Tue Oct 7 22:28:32 2014 +0200
Fixed CBot debugger (#325)
---
src/CBot/CBotStack.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/CBot/CBotStack.cpp b/src/CBot/CBotStack.cpp
index 1679e5e..84472ac 100644
--- a/src/CBot/CBotStack.cpp
+++ b/src/CBot/CBotStack.cpp
@@ -787,8 +787,9 @@ void CBotStack::GetRunPos(const char* &FunctionName, int
&start, int &end)
while (p->m_next != NULL)
{
+
if ( p->m_instr != NULL ) instr = p->m_instr;
- if ( p->m_bFunc == 1 ) funct = p->m_instr;
+ if ( p->m_bFunc == 1 && p->m_instr != NULL ) funct = p->m_instr;
if ( p->m_next->m_prog != prog ) break ;
if (p->m_next2 && p->m_next2->m_state != 0) p = p->m_next2 ;
@@ -807,7 +808,7 @@ void CBotStack::GetRunPos(const char* &FunctionName, int
&start, int &end)
t = instr->GetToken();
start = t->GetStart();
- end = t->GetEnd();
+ end = t->GetEnd();
}
CBotVar* CBotStack::GetStackVars(const char* &FunctionName, int level)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
