ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge for real

Browse Source
This commit is contained in:
Michael Zanetti 2014-10-12 01:01:35 +02:00 committed by Michael Zanetti
parent aad334c799
commit 04ed3f5685
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libguh/devicemanager.cpp
View File

@ -201,8 +201,8 @@ DeviceManager::DeviceError DeviceManager::discoverDevices(const DeviceClassId &d
return DeviceErrorPluginNotFound; return DeviceErrorPluginNotFound;
} }
m_discoveringPlugins.append(plugin); m_discoveringPlugins.append(plugin);
QPair<DeviceError, QString> ret = plugin->discoverDevices(deviceClassId, effectiveParams); DeviceError ret = plugin->discoverDevices(deviceClassId, effectiveParams);
if (ret.first != DeviceErrorAsync) { if (ret != DeviceErrorAsync) {
m_discoveringPlugins.removeOne(plugin); m_discoveringPlugins.removeOne(plugin);
} }
return ret; return ret;