From de1b70cf44775adcd48ee44ea7f2289719af8269 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 12 May 2016 10:24:15 +0200 Subject: [PATCH] Fix incorrect variable names for joined fields in filter expressions fixes #11779 --- lib/remote/filterutility.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp index d5e8cd1b0..d9f50e7bc 100644 --- a/lib/remote/filterutility.cpp +++ b/lib/remote/filterutility.cpp @@ -123,7 +123,10 @@ bool FilterUtility::EvaluateFilter(ScriptFrame& frame, Expression *filter, Object::Ptr joinedObj = target->NavigateField(fid); - vars->Set(field.Name, joinedObj); + if (field.NavigationName) + vars->Set(field.NavigationName, joinedObj); + else + vars->Set(field.Name, joinedObj); } return Convert::ToBool(filter->Evaluate(frame)); -- 2.50.0