diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-05-09 00:47:30 +0100 |
| commit | 3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4 (patch) | |
| tree | afd9aac45d87ca26cd83e5b176069195250a3d7f /cphidgetmanager.c | |
| parent | d070ed533fe8afdc672c6f04875f2c73f478c196 (diff) | |
| parent | 260123716172d33f44bdc0e4e5422554d139215c (diff) | |
| download | libphidget21-3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4.tar.gz | |
Merge tag 'upstream/2.1.8.20120507'
Upstream version 2.1.8.20120507
Diffstat (limited to 'cphidgetmanager.c')
| -rw-r--r-- | cphidgetmanager.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cphidgetmanager.c b/cphidgetmanager.c index eecdb04..d0f918b 100644 --- a/cphidgetmanager.c +++ b/cphidgetmanager.c @@ -125,6 +125,7 @@ int CPhidgetDetachEvent(CPhidgetHandle phid) { travPhid->fptrDetach((CPhidgetHandle)travPhid, travPhid->fptrDetachptr); travPhid->deviceIDSpec = 0; + travPhid->deviceUID = 0; #if !defined(_MACOSX) && !defined(WINCE) CPhidgetFHandle_free(travPhid->CPhidgetFHandle); @@ -298,6 +299,10 @@ int CCONV CPhidgetManager_close(CPhidgetManagerHandle phidm) if(!ActiveDevices && !ActivePhidgetManagers) { JoinCentralThread(); + //Shut down USB +#if defined(_LINUX) && !defined(_ANDROID) + CUSBUninit(); +#endif } CPhidget_clearStatusFlag(&phidm->status, PHIDGET_OPENED_FLAG, &phidm->lock); |