From: eshe <jessehakanen@gmail.com>
Date: Wed, 16 Jun 2010 18:14:14 +0000 (+0100)
Subject: Small fix to prevent daemon from closing itself.
X-Git-Url: http://vcs.maemo.org/git/?p=jenirok;a=commitdiff_plain;h=569ca90888e0dc0d41227186086796cc21aabc07

Small fix to prevent daemon from closing itself.
---

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index 343ecf7..5e2dd75 100644
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -48,6 +48,7 @@ retries_(-1), timer_(0)
 CallListener::~CallListener()
 {
     end();
+    DB::removeDatabase();
 }
 
 bool CallListener::begin()
@@ -276,7 +277,7 @@ void CallListener::callTerminate()
 {
     if(box_ && box_->isVisible())
     {
-        box_->close();
+        box_->hide();
     }
 
     searchClose();
@@ -333,6 +334,11 @@ void CallListener::searchInit()
 
 void CallListener::searchClose()
 {
+    if(!initialized_)
+    {
+        return;
+    }
+
     initialized_ = false;
 
     qDebug() << "Closing search...";
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 9c40744..70b783d 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -163,7 +163,6 @@ void SettingsDialog::saveSettings()
     Settings::instance()->set("autostart", autostart);
     QString connection = connectionSelector_->value().toString();
     Settings::instance()->set("connection", connection);
-    Settings::instance()->set("connection_name", connectionSelector_->text());
     QString language = languageSelector_->value().toString();
     Settings::instance()->set("language", language);
     sourceConfig_->save();