Fix popping the page stack when things are deleted
This commit is contained in:
parent
8a256d9bbb
commit
7dd59dd90f
@ -117,6 +117,7 @@ void Devices::addDevice(Device *device)
|
||||
emit dataChanged(index(idx), index(idx));
|
||||
});
|
||||
emit countChanged();
|
||||
emit thingAdded(device);
|
||||
}
|
||||
|
||||
void Devices::removeDevice(Device *device)
|
||||
@ -124,9 +125,10 @@ void Devices::removeDevice(Device *device)
|
||||
int index = m_devices.indexOf(device);
|
||||
beginRemoveRows(QModelIndex(), index, index);
|
||||
qDebug() << "Devices: removed device" << device->name();
|
||||
m_devices.removeAt(index);
|
||||
m_devices.takeAt(index)->deleteLater();
|
||||
endRemoveRows();
|
||||
emit countChanged();
|
||||
emit thingRemoved(device);
|
||||
}
|
||||
|
||||
void Devices::clearModel()
|
||||
|
||||
@ -73,6 +73,8 @@ protected:
|
||||
|
||||
signals:
|
||||
void countChanged();
|
||||
void thingAdded(Device *device);
|
||||
void thingRemoved(Device *device);
|
||||
|
||||
private:
|
||||
QList<Device *> m_devices;
|
||||
|
||||
@ -144,6 +144,16 @@ Page {
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: engine.deviceManager.devices
|
||||
onThingRemoved:{
|
||||
if (device == root.device) {
|
||||
print("Device destroyed")
|
||||
pageStack.pop()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: addToGroupDialog
|
||||
MeaDialog {
|
||||
|
||||
Reference in New Issue
Block a user