From c793dd8a7f321f26b3ce20487d8ed9b157ea571e Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 28 Nov 2020 22:38:21 +0200 Subject: [PATCH] dbcon IsConnected Runtime Fix (#10676) * dbcon IsConnected Runtime Fix * Update code/modules/admin/verbs/warning.dm Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> * Update code/modules/mob/abstract/new_player/menu.dm Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> * Update code/modules/admin/verbs/warning.dm Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> --- code/modules/admin/verbs/warning.dm | 3 +-- code/modules/mob/abstract/new_player/menu.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index 5343d704415..2774e382dad 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -311,8 +311,7 @@ var/dcolor = "#ffdddd" //dark colour, severity = 1 var/ecolor = "#e3e3e3" //gray colour, expired = 1 - establish_db_connection(dbcon) - if (!dbcon.IsConnected()) + if (!establish_db_connection(dbcon)) alert("Connection to the SQL database lost. Aborting. Please alert the database admin!") return diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm index ed71a3ecf48..53628e96e33 100644 --- a/code/modules/mob/abstract/new_player/menu.dm +++ b/code/modules/mob/abstract/new_player/menu.dm @@ -199,7 +199,7 @@ /obj/screen/new_player/selection/polls/Initialize() . = ..() - if(dbcon.IsConnected()) + if(establish_db_connection(dbcon)) var/mob/M = hud.mymob var/isadmin = M && M.client && M.client.holder var/DBQuery/query = dbcon.NewQuery("SELECT id FROM ss13_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM ss13_poll_vote WHERE ckey = \"[M.ckey]\") AND id NOT IN (SELECT pollid FROM ss13_poll_textreply WHERE ckey = \"[M.ckey]\")")