1 files changed, 14 insertions, 17 deletions

diff --git a/qt-gui.cpp b/qt-gui.cpp
index f955809d6..7414ad426 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -70,18 +70,6 @@ static QApplication *application = NULL;
 int        error_count;
 const char *existing_filename;
 
-void init_qt_ui(int *argcp, char ***argvp, char *errormessage)
-{
-	application->installTranslator(new Translator(application));
-	MainWindow *window = new MainWindow();
-	window->showError(errormessage);
-	window->show();
-	if (existing_filename && existing_filename[0] != '\0')
-		window->setTitle(MWTF_FILENAME);
-	else
-		window->setTitle(MWTF_DEFAULT);
-}
-
 const char *getSetting(QSettings &s, QString name)
 {
 	QVariant v;
@@ -98,9 +86,9 @@ void init_ui(int *argcp, char ***argvp)
 
 	application = new QApplication(*argcp, *argvp);
 
-        // tell Qt to use system proxies
-        // note: on Linux, "system" == "environment variables"
-        QNetworkProxyFactory::setUseSystemConfiguration(true);
+	// tell Qt to use system proxies
+	// note: on Linux, "system" == "environment variables"
+	QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 	// the Gtk theme makes things unbearably ugly
 	// so switch to Oxygen in this case
@@ -127,6 +115,15 @@ void init_ui(int *argcp, char ***argvp)
 	default_dive_computer_product = getSetting(s,"dive_computer_product");
 	default_dive_computer_device = getSetting(s, "dive_computer_device");
 	s.endGroup();
+
+	application->installTranslator(new Translator(application));
+	MainWindow *window = new MainWindow();
+	window->show();
+	if (existing_filename && existing_filename[0] != '\0')
+		window->setTitle(MWTF_FILENAME);
+	else
+		window->setTitle(MWTF_DEFAULT);
+
 	return;
 }
 
@@ -159,8 +156,8 @@ const QString get_dc_nickname(const char *model, uint32_t deviceid)
 {
 	const DiveComputerNode *existNode = dcList.getExact(model, deviceid);
 	if (!existNode)
-		return QString("");
-	if (existNode->nickName != "")
+		return QString();
+	else if (!existNode->nickName.isEmpty())
 		return existNode->nickName;
 	else
 		return model;