Commit 8f24db04 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition

parents 13a47000 09c63e4f
...@@ -773,7 +773,7 @@ bool CvCapture_MSMF::configureHW(bool enable) ...@@ -773,7 +773,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken))) if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken)))
{ {
captureMode = MODE_HW; captureMode = MODE_HW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
D3DMgr.Reset(); D3DMgr.Reset();
} }
...@@ -789,7 +789,7 @@ bool CvCapture_MSMF::configureHW(bool enable) ...@@ -789,7 +789,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (D3DDev) if (D3DDev)
D3DDev.Reset(); D3DDev.Reset();
captureMode = MODE_SW; captureMode = MODE_SW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
#else #else
return !enable; return !enable;
......
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