From 61d719d2aa2c04f56416f9b18808517cd7b4e385 Mon Sep 17 00:00:00 2001
From: Octopus136 <1361227324@qq.com>
Date: Fri, 16 Aug 2024 15:31:35 +0800
Subject: [PATCH] fix: reduce redundant code by optimizing device name
 retrieval

---
 modules/videoio/src/cap_dshow.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp
index 21af06a147..c1205d9810 100644
--- a/modules/videoio/src/cap_dshow.cpp
+++ b/modules/videoio/src/cap_dshow.cpp
@@ -1382,14 +1382,11 @@ int videoInput::listDevices(bool silent){
                  // Find the description or friendly name.
                 VARIANT varName;
                 VariantInit(&varName);
-                hr = pPropBag->Read(L"Description", &varName, 0);
+                hr = pPropBag->Read(L"FriendlyName", &varName, 0);
 
-                if (FAILED(hr)) hr = pPropBag->Read(L"FriendlyName", &varName, 0);
+                if (FAILED(hr)) hr = pPropBag->Read(L"Description", &varName, 0);
 
                 if (SUCCEEDED(hr)){
-
-                    hr = pPropBag->Read(L"FriendlyName", &varName, 0);
-
                     int count = 0;
                     int maxLen = sizeof(deviceNames[0])/sizeof(deviceNames[0][0]) - 2;
                     while( varName.bstrVal[count] != 0x00 && count < maxLen) {