From e87f2fcb89a77947c871c203e17ef02dfc216b49 Mon Sep 17 00:00:00 2001 From: JJRcop Date: Tue, 23 Sep 2014 01:02:52 -0400 Subject: [PATCH] I accidentally made querys run anyway even if they had parsing errors, fixed that --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 2ae22aae718..70af98fa0dd 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -165,9 +165,13 @@ parser.query = query_tree var/list/parsed_tree parsed_tree = parser.parse() - querys.len = querys_pos - querys[querys_pos] = parsed_tree - querys_pos++ + if(parsed_tree.len > 0) + querys.len = querys_pos + querys[querys_pos] = parsed_tree + querys_pos++ + else //There was an error so don't run anything, and tell the user which query has errored. + usr << "Parsing error on [querys_pos]\th query. Nothing was executed." + return list() query_tree = list() do_parse = 0 else