feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove duplicate devices

Browse Source 
In rare cases it can happen that the installer creates a device that happens
to have the same rootPath as a user created device. We need to filter
these out since otherwise it can be random which of the two devices
is selected.

Change-Id: I8269795a2e4f439fb2f02d819272723a504c6703
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-11-10 10:56:58 +01:00
parent 1ba366c5c0
commit d7869967ce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -174,7 +174,7 @@ void DeviceManager::load()
// devices with the same id. // devices with the same id.
for (IDevice::ConstPtr device : std::as_const(userDevices)) { for (IDevice::ConstPtr device : std::as_const(userDevices)) {
for (const IDevice::Ptr &sdkDevice : std::as_const(sdkDevices)) { for (const IDevice::Ptr &sdkDevice : std::as_const(sdkDevices)) {
if (device->id() == sdkDevice->id()) { if (device->id() == sdkDevice->id() || device->rootPath() == sdkDevice->rootPath()) {
if (device->version() < sdkDevice->version()) if (device->version() < sdkDevice->version())
device = sdkDevice; device = sdkDevice;
sdkDevices.removeOne(sdkDevice); sdkDevices.removeOne(sdkDevice);