Merge pull request OpenKinect#745 from Delicode/fix_openni2_enumeration

xlz · web-flow · commit 5819b6918ec7 · 2016-10-25T11:21:34.000-04:00
Fix OpenNI2 enumeration softlocking sensors
diff --git a/src/openni2/DeviceDriver.cpp b/src/openni2/DeviceDriver.cpp
@@ -429,7 +429,8 @@ namespace Freenect2Driver
     OniStatus initialize(oni::driver::DeviceConnectedCallback connectedCallback, oni::driver::DeviceDisconnectedCallback disconnectedCallback, oni::driver::DeviceStateChangedCallback deviceStateChangedCallback, void* pCookie)
     {
       DriverBase::initialize(connectedCallback, disconnectedCallback, deviceStateChangedCallback, pCookie);
-      for (int i = 0; i < freenect2.enumerateDevices(); i++)
+      int devices_found = freenect2.enumerateDevices();
+      for (int i = 0; i < devices_found; i++)
       {
         std::string uri = devid_to_uri(i);
         const char* modes_c[] = {

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,8 @@ namespace Freenect2Driver`
`429`	`429`	`OniStatus initialize(oni::driver::DeviceConnectedCallback connectedCallback, oni::driver::DeviceDisconnectedCallback disconnectedCallback, oni::driver::DeviceStateChangedCallback deviceStateChangedCallback, void* pCookie)`
`430`	`430`	`{`
`431`	`431`	`DriverBase::initialize(connectedCallback, disconnectedCallback, deviceStateChangedCallback, pCookie);`
`432`		`- for (int i = 0; i < freenect2.enumerateDevices(); i++)`
	`432`	`+ int devices_found = freenect2.enumerateDevices();`
	`433`	`+ for (int i = 0; i < devices_found; i++)`
`433`	`434`	`{`
`434`	`435`	`std::string uri = devid_to_uri(i);`
`435`	`436`	`const char* modes_c[] = {`