Commit 00fff3a8 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #11164 from corleypc:master

parents 24acbecd f4415153
...@@ -2912,7 +2912,7 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w ...@@ -2912,7 +2912,7 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w
// Enumerate the monikers. // Enumerate the monikers.
IMoniker *pMoniker = NULL; IMoniker *pMoniker = NULL;
ULONG cFetched; ULONG cFetched;
while ((pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK) && (!done)) while ((!done) && (pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK))
{ {
if(deviceCounter == deviceId) if(deviceCounter == deviceId)
{ {
...@@ -2951,6 +2951,12 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w ...@@ -2951,6 +2951,12 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w
pMoniker = NULL; pMoniker = NULL;
} }
} }
else
{
// cleaning for the case when this isn't the device we are looking for
pMoniker->Release();
pMoniker = NULL;
}
deviceCounter++; deviceCounter++;
} }
pEnumCat->Release(); pEnumCat->Release();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment