From 63cfe55b28f8a2901ea3d158fc7e6bf8fd0c6f0d Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 19 Apr 2016 09:27:31 +0000
Subject: [PATCH] Update on avatar guard management

---
 src/avatartranslator/AvatarGuard.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/avatartranslator/AvatarGuard.java b/src/avatartranslator/AvatarGuard.java
index 21f7075d10..7ffe785375 100644
--- a/src/avatartranslator/AvatarGuard.java
+++ b/src/avatartranslator/AvatarGuard.java
@@ -144,7 +144,7 @@ public abstract class AvatarGuard {
                 if (indexLParen == -1)
                     indexLParen = indexRParen;
 
-                for (String delim: new String[] {"and", "or"}) {
+                for (String delim: new String[] {"and", "or", "&&", "||"}) {
 
                     int indexBinaryOp = sane.substring (0, indexLParen).indexOf (delim, indexRParen+1);
                     if (indexBinaryOp != -1) {
-- 
GitLab