Browse Source

Evaluation fixes while program is running

Brian Fiete 2 years ago
parent
commit
a080d260ab
2 changed files with 6 additions and 2 deletions
  1. 1 1
      IDEHelper/DbgExprEvaluator.cpp
  2. 5 1
      IDEHelper/WinDebugger.cpp

+ 1 - 1
IDEHelper/DbgExprEvaluator.cpp

@@ -4022,7 +4022,7 @@ DbgTypedValue DbgExprEvaluator::LookupIdentifier(BfAstNode* identifierNode, bool
 			if (mStackSearch->mSearchStr != "*")
 			{
 				mDebugger->UpdateCallStackMethod(mCallStackIdx);
-				if (stackFrame->mSubProgram != NULL)
+				if ((stackFrame != NULL) && (stackFrame->mSubProgram != NULL))
 				{
 					int strLen = strlen(stackFrame->mSubProgram->mName);
 					if (strLen >= findStr.mLength)

+ 5 - 1
IDEHelper/WinDebugger.cpp

@@ -11035,7 +11035,11 @@ void WinDebugger::UpdateCallStack(bool slowEarlyOut)
 	if (!mIsPartialCallStack)
 		return;
 
-	BF_ASSERT(!IsInRunState());
+	if (mActiveThread == NULL)
+		return;
+
+	if (IsInRunState())
+		return;
 
 	uint32 tickStart = BFTickCount();