From 9ce92302d72daa87040fa00004c15eec5ff17fdb Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 3 Jul 2014 10:22:39 +0200 Subject: [PATCH] interpret empty filter strings as no filter instead of a broken filter (Fixes #1311) --- apps/opencs/model/filter/parser.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp index 6e286d943b..bec445cbc4 100644 --- a/apps/opencs/model/filter/parser.cpp +++ b/apps/opencs/model/filter/parser.cpp @@ -550,7 +550,12 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined) if (allowPredefined) token = getNextToken(); - if (!allowPredefined || token==Token (Token::Type_OneShot)) + if (allowPredefined && token==Token (Token::Type_EOS)) + { + mFilter.reset(); + return true; + } + else if (!allowPredefined || token==Token (Token::Type_OneShot)) { boost::shared_ptr node = parseImp (true, token!=Token (Token::Type_OneShot));