Changeset 66891 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

May 15, 2017 1:45:23 PM (8 years ago)

Author:

vboxsync

Message:

Main/EmulatedUSBImpl.cpp: WebcamsMap cleanup.

File:

• trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp

@@ -392 +392 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    WebcamsMap::iterator it = m.webcams.begin();
-    while (it != m.webcams.end())
+    for (WebcamsMap::iterator it = m.webcams.begin(); it != m.webcams.end(); ++it)
     {
         EUSBWEBCAM *p = it->second;
-        m.webcams.erase(it++);
-        p->Release();
-    }
+        if (p)
+        {
+            it->second = NULL;
+            p->Release();
+        }
+    }
+    m.webcams.clear();
     alock.release();