From 38296f6accedd10ca68e113cc2ef10cb47ba9426 Mon Sep 17 00:00:00 2001
From: Tomasz Olszak <olszak.tomasz@gmail.com>
Date: Thu, 29 Jun 2017 14:59:07 +0200
Subject: [PATCH] Fix inserting the same multiple items to PathsAndLanguages
Change-Id: Ie1df6fad425fd7198a72f531c19b3681627a5210
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
---
src/libs/qmljs/qmljsdialect.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp
index 8e4ff8ca5ae..9746490871f 100644
--- a/src/libs/qmljs/qmljsdialect.cpp
+++ b/src/libs/qmljs/qmljsdialect.cpp
@@ -280,11 +280,10 @@ bool PathsAndLanguages::maybeInsert(const PathAndLanguage &pathAndLanguage) {
if (currentElement.path() == pathAndLanguage.path()) {
int j = i;
do {
- if (pathAndLanguage.language() < currentElement.language()) {
- if (currentElement.language() == pathAndLanguage.language())
- return false;
+ if (pathAndLanguage.language() < currentElement.language())
break;
- }
+ if (currentElement.language() == pathAndLanguage.language())
+ return false;
++j;
if (j == m_list.length())
break;
--
GitLab