Skip to content

Commit a64189b

Browse files
committed
fix #593: keep device descriptor when closing device
Signed-off-by: Benn Snyder <[email protected]>
1 parent 7cb0d3c commit a64189b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

OpenNI2-FreenectDriver/src/DeviceDriver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace FreenectDriver
141141
return ONI_STATUS_OK;
142142
}
143143
}
144-
144+
145145
OniStatus setProperty(int propertyId, const void* data, int dataSize)
146146
{
147147
switch (propertyId)
@@ -190,7 +190,7 @@ namespace FreenectDriver
190190
return false;
191191
}
192192
}
193-
193+
194194
OniStatus invoke(int commandId, void* data, int dataSize)
195195
{
196196
switch (commandId)
@@ -247,7 +247,7 @@ namespace FreenectDriver
247247
std::string uri = devid_to_uri(i);
248248

249249
WriteMessage("Found device " + uri);
250-
250+
251251
OniDeviceInfo info;
252252
strncpy(info.uri, uri.c_str(), ONI_MAX_STR);
253253
strncpy(info.vendor, "Microsoft", ONI_MAX_STR);
@@ -281,7 +281,7 @@ namespace FreenectDriver
281281
{
282282
return iter->second;
283283
}
284-
else
284+
else
285285
{
286286
WriteMessage("Opening device " + std::string(uri));
287287
int id = uri_to_devid(iter->first.uri);
@@ -304,7 +304,7 @@ namespace FreenectDriver
304304
{
305305
WriteMessage("Closing device " + std::string(iter->first.uri));
306306
int id = uri_to_devid(iter->first.uri);
307-
devices.erase(iter);
307+
iter->second = NULL;
308308
deleteDevice(id);
309309
return;
310310
}

0 commit comments

Comments
 (0)