Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition

7 years ago · 8f24db048c
parent 13a4700084 09c63e4f00
commit 8f24db048c
1 changed files with 2 additions and 2 deletions
--- a/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
@ -773,7 +773,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
                    if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken)))
                    {
                        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();
                }
@ -789,7 +789,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
        if (D3DDev)
            D3DDev.Reset();
        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
    return !enable;