From 5a0a8102b7c6a431388ccefc8902082b6468cd08 Mon Sep 17 00:00:00 2001
From: Abs62 <ottomann@yandex.ru>
Date: Tue, 4 Jul 2017 01:01:51 +0300
Subject: [PATCH] Dsl: One more fix for '@' handling

---
 dsl.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dsl.cc b/dsl.cc
index 341250fa..e5366a81 100644
--- a/dsl.cc
+++ b/dsl.cc
@@ -1412,6 +1412,16 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
         hpos = str.find( L'@');
         if( hpos == wstring::npos || str[ hpos - 1 ] == L'\\' )
           break;
+        else
+        {
+          // Check for unescaped '@' inside string
+          size_t i;
+          for( i = 0; i < hpos; i++ )
+            if( !isDslWs( str[ i ] ) )
+                break;
+          if( i < hpos )
+            break;
+        }
       }
       else
         break;