Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / modules / extra / m_sqlite3.cpp

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 8a4a6665773edb4b6e482fd7548fdc9ec9da3e6b..1e3a65a18fdea27e4483daff11f05fd366534116 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -24,7 +24,7 @@
 #include <sqlite3.h>
 #include "sql.h"
 
-#ifdef WINDOWS
+#ifdef _WIN32
 # pragma comment(lib, "sqlite3.lib")
 #endif
 
@@ -97,8 +97,11 @@ class SQLConn : public SQLProvider
 
        ~SQLConn()
        {
-               sqlite3_interrupt(conn);
-               sqlite3_close(conn);
+               if (conn)
+               {
+                       sqlite3_interrupt(conn);
+                       sqlite3_close(conn);
+               }
        }
 
        void Query(SQLQuery* query, const std::string& q)
@@ -219,7 +222,7 @@ class ModuleSQLite3 : public Module
                ReadConf();
 
                Implementation eventlist[] = { I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleSQLite3()