New upstream version 26.1.0+dfsg1
This commit is contained in:
parent
040dcc3fc2
commit
013818c4af
594 changed files with 19576 additions and 4478 deletions
4
deps/obs-scripting/CMakeLists.txt
vendored
4
deps/obs-scripting/CMakeLists.txt
vendored
|
|
@ -87,10 +87,6 @@ if(UI_ENABLED)
|
|||
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
|
||||
endif()
|
||||
|
||||
IF(BUILD_CAPTIONS)
|
||||
string(TOUPPER "${BUILD_CAPTIONS}" BUILD_CAPTIONS)
|
||||
endif()
|
||||
|
||||
configure_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/obs-scripting-config.h.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/obs-scripting-config.h")
|
||||
|
|
|
|||
1
deps/obs-scripting/obs-scripting-config.h.in
vendored
1
deps/obs-scripting/obs-scripting-config.h.in
vendored
|
|
@ -21,4 +21,3 @@
|
|||
#define COMPILE_LUA @LUAJIT_FOUND@
|
||||
#define COMPILE_PYTHON @PYTHON_FOUND@
|
||||
#define UI_ENABLED @UI_ENABLED@
|
||||
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
|
||||
|
|
|
|||
2
deps/obs-scripting/obs-scripting-lua.c
vendored
2
deps/obs-scripting/obs-scripting-lua.c
vendored
|
|
@ -456,7 +456,7 @@ static int obs_lua_signal_handler_disconnect(lua_State *script)
|
|||
const char *cb_signal =
|
||||
calldata_string(&cb->base.extra, "signal");
|
||||
|
||||
if (cb_signal && strcmp(signal, cb_signal) != 0 &&
|
||||
if (cb_signal && strcmp(signal, cb_signal) == 0 &&
|
||||
handler == cb_handler)
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue