Merge remote-tracking branch 'origin/Applications/18.12'

This commit is contained in:
Thomas Surrel 2018-11-17 14:44:02 +01:00
commit 1f162f181c

View file

@ -473,7 +473,8 @@ void PlacesItemModel::slotStorageTearDownDone(Solid::ErrorType error, const QVar
if (error && errorData.isValid()) {
emit errorMessage(errorData.toString());
}
m_deviceToTearDown->disconnect();
disconnect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
this, &PlacesItemModel::slotStorageTearDownDone);
m_deviceToTearDown = nullptr;
}