Browse Source

Merge pull request #2091 from Programatic/xshm_wrong_windows

linux-capture: Fix bug where multiple 0x0 windows would appear
Jim 6 years ago
parent
commit
26312486cf
2 changed files with 3 additions and 2 deletions
  1. 0 1
      plugins/linux-capture/xhelpers.c
  2. 3 1
      plugins/linux-capture/xshm-input.c

+ 0 - 1
plugins/linux-capture/xhelpers.c

@@ -108,7 +108,6 @@ int randr_screen_count(xcb_connection_t *xcb)
 {
 	if (!xcb)
 		return 0;
-
 	xcb_screen_t *screen;
 	screen = xcb_setup_roots_iterator(xcb_get_setup(xcb)).data;
 

+ 3 - 1
plugins/linux-capture/xshm-input.c

@@ -324,7 +324,9 @@ static bool xshm_server_changed(obs_properties_t *props, obs_property_t *p,
 			    ")",
 			    i, w, h, x, y);
 
-		obs_property_list_add_int(screens, screen_info.array, i);
+		if (h > 0 && w > 0)
+			obs_property_list_add_int(screens, screen_info.array,
+						  i);
 	}
 
 	/* handle missing screen */