From 659d1d5e5ee9e2111e3b7c6f429ad5a506a89f37 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 10 Apr 2012 17:21:41 +0200
Subject: foo

---
 src/fbgui/agui.cpp  | 2 +-
 src/fbgui/ndgui.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/fbgui/agui.cpp b/src/fbgui/agui.cpp
index 84c2322..30874e7 100644
--- a/src/fbgui/agui.cpp
+++ b/src/fbgui/agui.cpp
@@ -39,7 +39,7 @@ void agui::setupLayout() {
 	// setup layout of the gui: debug split or browser
 	_webView = new QWebView(this);
 	//_webView->setContextMenuPolicy(Qt::NoContextMenu); // if this does not work try Qt::CustomContextMenu
-	_webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical,	Qt::ScrollBarAlwaysOff);
+	//_webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical,	Qt::ScrollBarAlwaysOff);
 	if (debugMode > -1) {
 		// split main window in browser & debug console
 		Console* debugConsole = new Console(this);
diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index c74ae82..03e5254 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -31,7 +31,6 @@ ndgui::ndgui() :
  */
 ndgui::~ndgui() {
 	delete _allowUserChoice;
-	delete _tryAgain;
 	delete _networkDiscovery;
 }
 
@@ -145,8 +144,7 @@ void ndgui::handleAllProcessesFinished(bool userChoice) {
 	} else {
 		LOG4CXX_DEBUG(ndLogger, " No usable interfaces found!: " << _networkDiscovery->getErrorStr());
 		LOG4CXX_DEBUG(ndLogger, " list is empty");
-		_jsi->abortBoot("No usable interfaces found!"
-				+ _networkDiscovery->getErrorStr());
+		_jsi->abortBoot("No usable interfaces found!" + _networkDiscovery->getErrorStr());
 	}
 }
 
-- 
cgit v1.2.3-55-g7522