diff options
-rw-r--r-- | src/networksettings/qnetworksettingsservicemodel.cpp | 11 | ||||
-rw-r--r-- | src/settingsui/network/WiredSettings.qml | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index a62d415..115fe35 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -380,13 +380,10 @@ bool QNetworkSettingsServiceFilter::filterAcceptsRow( int source_row, const QMod QModelIndex index = this->sourceModel()->index( source_row, 0, source_parent ); if (index.isValid()) { - if (index.isValid()) - { - QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole)); - QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj); - if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown) - return true; - } + QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole)); + QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj); + if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown) + return true; } } return false; diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml index 3bf211e..11c6c24 100644 --- a/src/settingsui/network/WiredSettings.qml +++ b/src/settingsui/network/WiredSettings.qml @@ -45,8 +45,9 @@ Item { } onServiceChanged: { - if (!service) { - service = NetworkSettingsManager.services.itemFromRow(0); + NetworkSettingsManager.services.type = NetworkSettingsType.Wired; + if (!root.service) { + root.service = NetworkSettingsManager.services.itemFromRow(0); } } |