Merge branch 'development' into mmcp-dev

Mudlet · May 7, 2024 · d37d45c · d37d45c
2 parents 0e55b62 + f4639c8
commit d37d45c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/TTextEdit.cpp b/src/TTextEdit.cpp
@@ -1109,14 +1109,13 @@ void TTextEdit::expandSelectionToWords()
     if (yind >= 0 && yind < static_cast<int>(mpBuffer->lineBuffer.size())) {
         for (; xind >= 0; --xind) {
             // Ensure xind is within the valid range for the current line
-            if (xind < static_cast<int>(mpBuffer->lineBuffer.at(yind).size())) {
-                const QChar currentChar = mpBuffer->lineBuffer.at(yind).at(xind);
-                if (currentChar == QChar::Space
-                    || mpHost->mDoubleClickIgnore.contains(currentChar)) {
-                    break;
-                }
-            } else {
+            if (xind >= static_cast<int>(mpBuffer->lineBuffer.at(yind).size())) {
                 break; // xind is out of bounds, break the loop
+            } 
+            const QChar currentChar = mpBuffer->lineBuffer.at(yind).at(xind);
+            if (currentChar == QChar::Space
+                || mpHost->mDoubleClickIgnore.contains(currentChar)) {
+                break;
             }
         }
     }

diff --git a/src/mudlet.cpp b/src/mudlet.cpp
@@ -4347,8 +4347,8 @@ Hunhandle* mudlet::prepareProfileDictionary(const QString& hostName, QSet<QStrin
     wordSet = QSet<QString>(wordList.begin(), wordList.end());
 
 #if defined(Q_OS_WIN32)
-    mudlet::self()->sanitizeUtf8Path(affixPath, qsl("profile.dic"));
-    mudlet::self()->sanitizeUtf8Path(dictionaryPath, qsl("profile.aff"));
+    mudlet::self()->sanitizeUtf8Path(dictionaryPath, qsl("profile.dic"));
+    mudlet::self()->sanitizeUtf8Path(affixPath, qsl("profile.aff"));
 #endif
     return Hunspell_create(affixPath.toUtf8().constData(), dictionaryPath.toUtf8().constData());
 }