Skip to content

Commit 4dcdf8d

Browse files
Merge pull request #74 from Aperture-Development/development
Critical bugfix
2 parents 49127f3 + 3315904 commit 4dcdf8d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lua/msync/server/sv_modules.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function MSync.enableModule( module )
100100
if MSync.modules[module] then
101101
MSync.log(MSYNC_DBG_DEBUG, "Module \"" .. module .. "\" enabled?: " .. tostring(MSync.settings.data.enabledModules[module]))
102102
if not MSync.settings.data.enabledModules[module] then
103-
if MSync.DBServer:ping() then
103+
if MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED then
104104
local initTransaction = MSync.DBServer:createTransaction()
105105

106106
MSync.modules[module].init(initTransaction)

lua/msync/server/sv_net.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function MSync.net.dbStatus(ply)
6262
MSync.log(MSYNC_DBG_DEBUG, "Exec: net.dbStatus. Param.: " .. tostring(ply))
6363
net.Start("msync.dbStatus")
6464
if MSync.DBServer then
65-
net.WriteBool(MSync.DBServer:ping())
65+
net.WriteBool(MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED and true or false)
6666
else
6767
net.WriteBool(false)
6868
end
@@ -190,7 +190,7 @@ net.Receive("msync.connectDB", function(len, ply)
190190
if not ply:query("msync.connectDB") then return end
191191

192192
if MSync.DBServer then
193-
if not MSync.DBServer:ping() then
193+
if not (MSync.DBServer:status() == mysqloo.DATABASE_CONNECTED) then
194194
MSync.mysql.initialize()
195195
else
196196
MSync.net.sendMessage(ply, "error", "The database is already connected!")

0 commit comments

Comments
 (0)