summaryrefslogtreecommitdiffstats
path: root/src/ndgui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ndgui.cpp')
-rw-r--r--src/ndgui.cpp19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/ndgui.cpp b/src/ndgui.cpp
index d99dfd8..6988477 100644
--- a/src/ndgui.cpp
+++ b/src/ndgui.cpp
@@ -88,6 +88,7 @@ void ndgui::init () {
connect(_networkDiscovery, SIGNAL(updateStatus(QString)), this, SLOT(updateStatus(const QString&)));
connect(_networkDiscovery, SIGNAL(allProcessesFinished()), this, SLOT(handleAllProcessesFinished()));
connect(_networkDiscovery, SIGNAL(continueBoot(QString)), this, SLOT(continueBoot(QString)));
+ connect(_networkDiscovery, SIGNAL(continueBootWithoutCheck(QString )), this, SLOT(continueBootWithoutCheck(QString)));
connect(_webView->page()->mainFrame(), SIGNAL(
@@ -289,7 +290,7 @@ void ndgui::handleAllProcessesFinished() {
}
}
} else {
- abortBoot("No usable interfaces found!");
+ abortBoot("No usable interfaces found!" + _networkDiscovery->GetErrorStr());
}
}
@@ -344,6 +345,15 @@ void ndgui::continueBoot(QString ifName) {
}
}
+
+
+
+/**/
+void ndgui::continueBootWithoutCheck(QString ifName) {
+ qxtLog->debug() << _tag << " continue with interface: " << ifName;
+ emit initFbgui();
+ this->close();
+}
//void ndgui::continueBoot(QString ifName) {
// if (!_userChoice) {
// foreach(QString i, _ifNameList)
@@ -399,8 +409,11 @@ QString ndgui::readLogFile() {
/**/
void ndgui::tryAgain() {
qxtLog->debug()<< _tag << " try again ";
- delete _debugConsole;
- delete _toggleDebugConsole;
+ if(debugMode > -1) {
+ delete _splitter;
+ delete _debugConsole;
+ delete _toggleDebugConsole;
+ }
delete _allowUserChoice;
delete _webView;
delete _networkDiscovery;