ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wifi setup page stack issue

Browse Source
This commit is contained in:
Simon Stürz 2018-07-17 17:00:05 +02:00
parent f9212cc64c
commit 8038841322
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-app-core/wifisetup/bluetoothdevice.cpp
View File

@ -81,6 +81,9 @@ void BluetoothDevice::disconnectDevice()
void BluetoothDevice::setConnected(const bool &connected)
{
if (m_connected == connected)
return;
m_connected = connected;
emit connectedChanged();
}

12
nymea-app/ui/connection/BluetoothDiscoveryPage.qml
View File

@ -172,7 +172,7 @@ Page {
id: connectingPageComponent
Page {
id: root
id: connectingPage
header: GuhHeader {
text: qsTr("Establish bluetooth connection")
onBackPressed: pageStack.pop()
@ -183,8 +183,8 @@ Page {
NetworkManagerControler {
id: networkManger
name: root.name
address: root.address
name: connectingPage.name
address: connectingPage.address
Component.onCompleted: networkManger.connectDevice()
}
@ -193,15 +193,15 @@ Page {
target: networkManger.manager
onInitializedChanged: {
if (networkManger.manager.initialized) {
pageStack.push(Qt.resolvedUrl("../WirelessControlerPage.qml"), { name: root.name, address: root.address, networkManger: networkManger } )
pageStack.push(Qt.resolvedUrl("../WirelessControlerPage.qml"), { name: connectingPage.name, address: connectingPage.address, networkManger: networkManger } )
} else {
pageStack.pop()
pageStack.pop(root)
}
}
onConnectedChanged: {
if (!networkManger.manager.connected) {
pageStack.pop()
pageStack.pop(root)
}
}
}