Merge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode

bf5ff7fc · Vadim Pisarevsky · 1f43999f · c669b7e4 · bf5ff7fc
Commit bf5ff7fc authored Dec 02, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cap_giganetix.cpp modules/videoio/src/cap_giganetix.cpp +2 -1

No files found.
--- a/modules/videoio/src/cap_giganetix.cpp
+++ b/modules/videoio/src/cap_giganetix.cpp
@@ -393,7 +393,8 @@ CvCaptureCAM_Giganetix::open( int index )

    for (int i = 0; i < (int) DevicesList.size() && !b_ret; i++)
    {
-      if((b_ret = i == index))
+      b_ret = (i == index);
+      if(b_ret)
      {
        m_device = DevicesList[i];
        b_ret = m_device->Connect ();