[skip ci] fixed callback error crash

mef51 · Feb 1, 2021 · dec6044 · dec6044
1 parent c0524d1
commit dec6044
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/DearPyGui/src/core/PythonUtilities/mvPythonExceptions.cpp b/DearPyGui/src/core/PythonUtilities/mvPythonExceptions.cpp
@@ -13,7 +13,13 @@ namespace Marvel
 
 		std::string fullMessage = "Line: %d \t" + message;
 
-		int line = PyFrame_GetLineNumber(PyEval_GetFrame());
+		int line = 0;
+		auto f = PyEval_GetFrame();
+		if (f)
+			line = PyFrame_GetLineNumber(f);
+		else
+			fullMessage.append(" || error occured in a callback");
+
 		PyErr_Format(PyExc_Exception, fullMessage.c_str(), line);
 		PyErr_Print();
 	}

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ version: 0.6.{build}
 
 branches:
   only:
-  - master
+  - 0.6.x
 build:
   verbosity: minimal
 

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -23,10 +23,12 @@ HOW TO UPDATE?
 - Please report any issue!
 
 ------------------------------------------------------------------------
- VERSION 0.7.x
+ VERSION 0.6.x
 ------------------------------------------------------------------------
 
-Decorated log: https://github.com/hoffstadt/DearPyGui/releases/tag/v0.7.x
+Fixes:
+- callback_error: prevent callback error crash
+- set_color_map crash #512
 
 ------------------------------------------------------------------------
  VERSION 0.6.151