From c5738c61258d5e901529d7ac531f6163f102f998 Mon Sep 17 00:00:00 2001 From: gla Date: Tue, 20 Aug 2019 12:44:44 +0200 Subject: [PATCH] dshowsrcwrapper: fix regression on device selection Do not take device_name if a device has been specified. Do not take device_index into account if a device or a device name has been specified. --- sys/dshowsrcwrapper/gstdshow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dshowsrcwrapper/gstdshow.cpp b/sys/dshowsrcwrapper/gstdshow.cpp index 24a241a..2b41dcb 100644 --- a/sys/dshowsrcwrapper/gstdshow.cpp +++ b/sys/dshowsrcwrapper/gstdshow.cpp @@ -443,10 +443,10 @@ gst_dshow_select_device (const GUID * device_category, if (device && g_strcmp0 (device, entry->device) == 0) { selected = entry; break; - } else if (device_name && g_strcmp0 (device_name, entry->device_name) == 0) { + } else if (!device && device_name && g_strcmp0 (device_name, entry->device_name) == 0) { selected = entry; break; - } else if (device_index == entry->device_index) { + } else if (!device && !deviceName && device_index == entry->device_index) { selected = entry; break; } -- 2.7.4