From b756c78f44f1127d2d0c66ac0dcfeb0017a3a54e Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Wed, 7 Jun 2023 23:34:39 +0200 Subject: [PATCH] win-capture: Skip compat helper matching if properties are null Fixes compatibility messages appearing when no window is selected in window capture properties. --- plugins/win-capture/compat-helpers.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/win-capture/compat-helpers.c b/plugins/win-capture/compat-helpers.c index 2ba9ce5c5..f4d5565ec 100644 --- a/plugins/win-capture/compat-helpers.c +++ b/plugins/win-capture/compat-helpers.c @@ -145,16 +145,17 @@ struct compat_result *check_compatibility(const char *win_title, const char *j_title = get_string_val(entry, "window_title"); const char *j_class = get_string_val(entry, "window_class"); - if (win_class && (match_flags & MATCH_CLASS) && - strcmp(win_class, j_class) != 0) + if ((match_flags & MATCH_CLASS) && + (!win_class || strcmp(win_class, j_class) != 0)) continue; - if (exe && (match_flags & MATCH_EXE) && - astrcmpi(exe, j_exe) != 0) + if ((match_flags & MATCH_EXE) && + (!exe || astrcmpi(exe, j_exe) != 0)) continue; /* Title supports partial matches as some games append additional * information after the title, e.g., "Minecraft 1.18". */ - if (win_title && (match_flags & MATCH_TITLE) && - astrcmpi_n(win_title, j_title, strlen(j_title)) != 0) + if ((match_flags & MATCH_TITLE) && + (!win_title || + astrcmpi_n(win_title, j_title, strlen(j_title)) != 0)) continue; /* Attempt to translate and compile message */