Skip to content
Snippets Groups Projects
Commit 79d2fca3 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

RemoteLinux: Fix bugs introduced by recent refactorings.


Change-Id: I89eeb0bbd4bdc319e21d077d95eb50f31aa23ecd
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent af205ab2
No related branches found
No related tags found
No related merge requests found
...@@ -56,6 +56,7 @@ DeviceManagerModel::DeviceManagerModel(const LinuxDeviceConfigurations *deviceMa ...@@ -56,6 +56,7 @@ DeviceManagerModel::DeviceManagerModel(const LinuxDeviceConfigurations *deviceMa
SLOT(handleDeviceAdded(QSharedPointer<const LinuxDeviceConfiguration>))); SLOT(handleDeviceAdded(QSharedPointer<const LinuxDeviceConfiguration>)));
connect(deviceManager, SIGNAL(deviceRemoved(int)), SLOT(handleDeviceRemoved(int))); connect(deviceManager, SIGNAL(deviceRemoved(int)), SLOT(handleDeviceRemoved(int)));
connect(deviceManager, SIGNAL(displayNameChanged(int)), SLOT(handleDataChanged(int))); connect(deviceManager, SIGNAL(displayNameChanged(int)), SLOT(handleDataChanged(int)));
connect(deviceManager, SIGNAL(defaultStatusChanged(int)), SLOT(handleDataChanged(int)));
connect(deviceManager, SIGNAL(deviceListChanged()), SLOT(handleDeviceListChanged())); connect(deviceManager, SIGNAL(deviceListChanged()), SLOT(handleDeviceListChanged()));
} }
......
...@@ -362,7 +362,7 @@ LinuxDeviceConfiguration::Id LinuxDeviceConfigurations::unusedId() const ...@@ -362,7 +362,7 @@ LinuxDeviceConfiguration::Id LinuxDeviceConfigurations::unusedId() const
{ {
typedef LinuxDeviceConfiguration::Id IdType; typedef LinuxDeviceConfiguration::Id IdType;
for (IdType id = 0; id <= std::numeric_limits<IdType>::max(); ++id) { for (IdType id = 0; id <= std::numeric_limits<IdType>::max(); ++id) {
if (!find(id)) if (id != LinuxDeviceConfiguration::InvalidId && !find(id))
return id; return id;
} }
QTC_CHECK(false); QTC_CHECK(false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment