summaryrefslogtreecommitdiffstats
path: root/src/fbgui/ndgui.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2012-02-22 11:28:40 +0100
committerJonathan Bauer2012-02-22 11:28:40 +0100
commit39ec25f4244a1cefbbf520ef615823a5991045db (patch)
tree965283ccb226f6b038271b819455b4738a7121d9 /src/fbgui/ndgui.cpp
parentglobals in extra class, new javascript interface classes for fbgui and ndgui,... (diff)
downloadfbgui-39ec25f4244a1cefbbf520ef615823a5991045db.tar.gz
fbgui-39ec25f4244a1cefbbf520ef615823a5991045db.tar.xz
fbgui-39ec25f4244a1cefbbf520ef615823a5991045db.zip
fix for continueBoot button from user choice dialog
Diffstat (limited to 'src/fbgui/ndgui.cpp')
-rw-r--r--src/fbgui/ndgui.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index 40c7cea..0d99a22 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -69,6 +69,8 @@ void ndgui::init() {
SLOT(handleAllProcessesFinished()));
connect(_networkDiscovery, SIGNAL(continueBoot(QString)), this,
SLOT(continueBoot(QString)));
+ connect(_jsi, SIGNAL(startFbgui(const QString&)), this,
+ SLOT(continueBoot(const QString&)));
connect(_networkDiscovery, SIGNAL(continueBootWithoutCheck(QString )),
this, SLOT(continueBootWithoutCheck(QString)));
@@ -181,7 +183,7 @@ void ndgui::handleAllProcessesFinished() {
* will start the fbgui screen. All networkDiscovery signals
* will be ignored after this point.
*/
-void ndgui::continueBoot(QString ifName) {
+void ndgui::continueBoot(const QString& ifName) {
if (_networkDiscovery->checkConnectivity(ifName)) {
LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName);
gInterfaceName = ifName;