aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2017-06-29 14:59:07 +0200
committerMarco Benelli <marco.benelli@qt.io>2017-07-03 06:45:03 +0000
commit38296f6accedd10ca68e113cc2ef10cb47ba9426 (patch)
tree50fd0e43d3f1aee94e98f02738ff49627155cdb6
parent629c137ef24e7a86015d7f944cf928ab359610a1 (diff)
Fix inserting the same multiple items to PathsAndLanguages
Change-Id: Ie1df6fad425fd7198a72f531c19b3681627a5210 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
-rw-r--r--src/libs/qmljs/qmljsdialect.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp
index 8e4ff8ca5a..9746490871 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;