From f9b5c8a1f4dcfeb2af820309113d45095db23eea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 23 Jul 2019 09:55:14 -0400
Subject: [PATCH] If query is empty don't bother parsing it

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 8383e43b7..1c0dd151b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -132,6 +132,12 @@ sub Sql {
   my $self = shift;
   $$self{Sql} = shift if @_;
   if ( ! $$self{Sql} ) {
+    $self->{Sql} = '';
+    if ( ! $self->{Query} ) {
+      Warning("No query in Filter!");
+      return;
+    }
+
     my $filter_expr = ZoneMinder::General::jsonDecode($self->{Query});
     my $sql = 'SELECT E.*,
        unix_timestamp(E.StartTime) as Time,
@@ -142,7 +148,6 @@ sub Sql {
          INNER JOIN Monitors as M on M.Id = E.MonitorId
          LEFT JOIN Storage as S on S.Id = E.StorageId
          ';
-    $self->{Sql} = '';
 
     if ( $filter_expr->{terms} ) {
       foreach my $term ( @{$filter_expr->{terms}} ) {