fix Qt Database error message when close the app

src/engine/local_engine/replay.cpp

@@ -22,9 +22,9 @@
 Replay::Replay() : replaySqliteLogDb(0)
 {
 
-    replaySqliteLogDb = new QSqlDatabase();
-
-    *replaySqliteLogDb = QSqlDatabase::addDatabase("QSQLITE");
+//    replaySqliteLogDb = new QSqlDatabase();
+//
+//    *replaySqliteLogDb = QSqlDatabase::addDatabase("QSQLITE");
     //replaySqliteLogDb->setDatabaseName(myLogDir->absolutePath()+"/pokerth-log-"+currentTime.toString("yyyy-MM-dd_hh.mm.ss")+".pdb");
     //if(!mySqliteLogDb->open()) {
     //   QMessageBox::critical(0, tr("ERROR"),mySqliteLogDb->lastError().text().toUtf8().data(), QMessageBox::Cancel);
@@ -35,7 +35,7 @@ Replay::Replay() : replaySqliteLogDb(0)
 Replay::~Replay()
 {
 
-    replaySqliteLogDb->close();
-    delete replaySqliteLogDb;
+//    replaySqliteLogDb->close();
+//    delete replaySqliteLogDb;
 
 }

src/gui/generic/serverguiwrapper.h

@@ -37,6 +37,7 @@ public:
     void setSession(boost::shared_ptr<Session> session);
 
     gameTableImpl* getMyW() const {return NULL;}
+    Log* getMyLog() const {return NULL;}
 
     void refreshSet() const;
     void refreshCash() const;

src/gui/guiinterface.h

@@ -27,7 +27,7 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-
+class Log;
 class Session;
 class gameTableImpl;
 
@@ -41,6 +41,8 @@ public:
     virtual void setSession(boost::shared_ptr<Session> session) =0;
 
     virtual gameTableImpl *getMyW() const=0;
+    virtual Log* getMyLog() const=0;
+
 
     //refresh-Funktionen
     virtual void refreshSet() const=0;

src/gui/qt/gametable/log/log.cpp

@@ -191,11 +191,7 @@ Log::Log(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), my
 
 Log::~Log()
 {
-qDebug() << "close log";
-
-        // Datenbank schließe
-        mySqliteLogDb->close();
-
+    cerr << "log destruktor";
     delete myConfig;
     delete myLogDir;
     delete myHtmlLogFile;
@@ -204,6 +200,18 @@ qDebug() << "close log";
     myConfig = 0;
 }
 
+bool Log::closeLogDb()
+{
+    // Datenbank schließen
+    mySqliteLogDb->close();
+    *mySqliteLogDb = QSqlDatabase();
+    if(mySqliteLogDb->isOpen())
+        return FALSE;
+    else
+        return TRUE;
+}
+
+
 void Log::logPlayerActionMsg(QString msg, int playerID, int action, int setValue) {
 
     switch (action) {

src/gui/qt/gametable/log/log.h

@@ -40,6 +40,8 @@ public:
 	~Log();
 
 public slots:
+
+        bool closeLogDb();
         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);

src/gui/qt/guiwrapper.h

@@ -44,6 +44,7 @@ public:
     void setSession(boost::shared_ptr<Session> session);
 
     gameTableImpl* getMyW() const { return myW; }
+    Log* getMyLog() const { return myLog; }
 
     void refreshSet() const;
     void refreshCash() const;

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -26,6 +26,7 @@
 #include <net/socket_msg.h>
 #include "tools.h"
 
+#include "log.h"
 #include "session.h"
 #include "game.h"
 #include "guiwrapper.h"
@@ -68,6 +69,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
     // #endif
     setupUi(this);
     this->setWindowTitle(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING)));
+    this->installEventFilter(this);
 
     //Widgets Grafiken per Stylesheets setzen
     QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
@@ -936,3 +938,17 @@ QString startWindowImpl::checkForFirstStartAfterUpdated()
     return QString();
 
 }
+
+bool startWindowImpl::eventFilter(QObject *obj, QEvent *event)
+{
+
+    if (event->type() == QEvent::Close) {
+        event->ignore();
+        myGuiInterface->getMyLog()->closeLogDb();
+        return QMainWindow::eventFilter(obj, event);
+    }
+    else {
+        // pass the event on to the parent class
+        return QMainWindow::eventFilter(obj, event);
+    }
+}

src/gui/qt/startwindow/startwindowimpl.h

@@ -58,6 +58,7 @@ public:
     connectToServerDialogImpl* getMyConnectToServerDialog() const {	return myConnectToServerDialog;	}
 
     //	void keyPressEvent( QKeyEvent *);
+    bool eventFilter(QObject *obj, QEvent *event);
 
 signals: 
     void signalShowClientDialog();