Merge pull request #74 from Aperture-Development/development

Critical bugfix
Aperture-Development · Jan 31, 2022 · 4dcdf8d · 4dcdf8d
2 parents 49127f3 + 3315904
commit 4dcdf8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lua/msync/server/sv_modules.lua b/lua/msync/server/sv_modules.lua
@@ -100,7 +100,7 @@ function MSync.enableModule( module )
     if MSync.modules[module] then
         MSync.log(MSYNC_DBG_DEBUG, "Module \"" .. module .. "\" enabled?: " .. tostring(MSync.settings.data.enabledModules[module]))
         if not MSync.settings.data.enabledModules[module] then
-            if MSync.DBServer:ping() then
+            if MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED then
                 local initTransaction = MSync.DBServer:createTransaction()
 
                 MSync.modules[module].init(initTransaction)

diff --git a/lua/msync/server/sv_net.lua b/lua/msync/server/sv_net.lua
@@ -62,7 +62,7 @@ function MSync.net.dbStatus(ply)
     MSync.log(MSYNC_DBG_DEBUG, "Exec: net.dbStatus. Param.: " .. tostring(ply))
     net.Start("msync.dbStatus")
         if MSync.DBServer then
-            net.WriteBool(MSync.DBServer:ping())
+            net.WriteBool(MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED and true or false)
         else
             net.WriteBool(false)
         end
@@ -190,7 +190,7 @@ net.Receive("msync.connectDB", function(len, ply)
     if not ply:query("msync.connectDB") then return end
 
     if MSync.DBServer then
-        if not MSync.DBServer:ping() then
+        if not (MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED) then
             MSync.mysql.initialize()
         else
             MSync.net.sendMessage(ply, "error", "The database is already connected!")