opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

deps/obs-scripting: Allow NULL script with script_log

Browse Source 
(This commit also modifies the frontend-tools module)

Prevents a potential crash when script_log is called by a thread spawned
by a python library.
This commit is contained in:
jp9000
2018-01-31 16:20:45 -08:00
parent c87597f7d6
commit a2ae16e98c
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deps/obs-scripting/obs-scripting-python.c
Vendored
+5 -1
View File
@@ -1193,7 +1193,11 @@ static PyObject *py_script_log_internal(PyObject *self, PyObject *args,
while (endl) {
*endl = 0;
script_log(&cur_python_script->base, log_level, "%s", start);
if (cur_python_script)
script_log(&cur_python_script->base, log_level, "%s",
start);
else
script_log(NULL, log_level, "%s", start);
*endl = '\n';
start = endl + 1;