html regex fixes

corybolar · Jun 13, 2017 · d4c966f · d4c966f
1 parent 3b16d6c
commit d4c966f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/pxminireader.cpp b/src/pxminireader.cpp
@@ -187,4 +187,5 @@ bool PXMIniReader::getUpdates() const
 #ifdef _WIN32
     return iniFile->value("config/Autoupdate", true).toBool();
 #endif
+    return false;
 }
diff --git a/src/pxmmainwindow.cpp b/src/pxmmainwindow.cpp
@@ -554,7 +554,7 @@ int PXMWindow::sendButtonClicked()
 
     if (!(ui->textEdit->toPlainText().isEmpty())) {
         QString fixedURLS = ui->textEdit->toHtml();
-        QRegularExpression urls("(https?://([a-zA-Z0-9_-]+.)?[a-zA-Z0-9_-]+.[a-z]{2,3})");
+        QRegularExpression urls("(https?://([a-zA-Z0-9_-]+.)?[a-zA-Z0-9_-]+[^< ]*)");
         QString body = fixedURLS.right(fixedURLS.length() - fixedURLS.indexOf("<html>"));
         body.replace(urls, "<a href=\"\\1\">\\1</a>");
         fixedURLS      = fixedURLS.left(fixedURLS.indexOf("<html>")) % body;