From 95da669f91badca92591e8dba9e6af26e6352ce9 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Tue, 13 Jul 2010 19:34:05 +0000
Subject: [PATCH] fix Qt Database error message when close the app

---
 src/gui/qt/gametable/log/log.cpp           | 9 +++------
 src/gui/qt/gametable/log/log.h             | 2 +-
 src/gui/qt/startwindow/startwindowimpl.cpp | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/gui/qt/gametable/log/log.cpp b/src/gui/qt/gametable/log/log.cpp
index c505dfc6..109af4cd 100755
--- a/src/gui/qt/gametable/log/log.cpp
+++ b/src/gui/qt/gametable/log/log.cpp
@@ -200,15 +200,12 @@ Log::~Log()
     myConfig = 0;
 }
 
-bool Log::closeLogDb()
+void Log::closeLogDbAtExit()
 {
     // Datenbank schließen
     mySqliteLogDb->close();
-    *mySqliteLogDb = QSqlDatabase();
-    if(mySqliteLogDb->isOpen())
-        return FALSE;
-    else
-        return TRUE;
+    delete mySqliteLogDb;
+    mySqliteLogDb = NULL;
 }
 
 
diff --git a/src/gui/qt/gametable/log/log.h b/src/gui/qt/gametable/log/log.h
index 804bb0ed..cc8c3122 100755
--- a/src/gui/qt/gametable/log/log.h
+++ b/src/gui/qt/gametable/log/log.h
@@ -41,7 +41,7 @@ public:
 
 public slots:
 
-        bool closeLogDb();
+        void closeLogDbAtExit();
         void logPlayerActionMsg(QString playerName, int playerID, int action, int setValue);
 	void logNewGameHandMsg(int gameID, int handID);
 	void logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString bbName);
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index c67540fd..a1aad9c3 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -941,10 +941,9 @@ QString startWindowImpl::checkForFirstStartAfterUpdated()
 
 bool startWindowImpl::eventFilter(QObject *obj, QEvent *event)
 {
-
     if (event->type() == QEvent::Close) {
         event->ignore();
-        myGuiInterface->getMyLog()->closeLogDb();
+        myGuiInterface->getMyLog()->closeLogDbAtExit();
         return QMainWindow::eventFilter(obj, event);
     }
     else {