summaryrefslogtreecommitdiff
path: root/src/linguist/lupdate/merge.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/linguist/lupdate/merge.cpp')
-rw-r--r--src/linguist/lupdate/merge.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/linguist/lupdate/merge.cpp b/src/linguist/lupdate/merge.cpp
index 910aa1845..273ace6ad 100644
--- a/src/linguist/lupdate/merge.cpp
+++ b/src/linguist/lupdate/merge.cpp
@@ -106,10 +106,12 @@ static QString translationAttempt(const QString &oldTranslation,
for (i = 0; i < oldTranslation.size(); i++) {
attempt += oldTranslation[i];
for (k = 0; k < p; k++) {
- if (oldTranslation[i] == oldNumbers[k][matchedYet[k]])
+ if (matchedYet[k] < oldNumbers[k].size() &&
+ oldTranslation[i] == oldNumbers[k][matchedYet[k]]) {
matchedYet[k]++;
- else
+ } else {
matchedYet[k] = 0;
+ }
}
/*