From d4c966f798b821a039f1f21708dd321e0e34348b Mon Sep 17 00:00:00 2001 From: Cory Bolar Date: Tue, 13 Jun 2017 15:37:45 -0400 Subject: [PATCH] html regex fixes --- src/pxminireader.cpp | 1 + src/pxmmainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pxminireader.cpp b/src/pxminireader.cpp index cc7492e..a851c93 100644 --- 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 index 184695c..b95bfcd 100644 --- 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("")); body.replace(urls, "\\1"); fixedURLS = fixedURLS.left(fixedURLS.indexOf("")) % body;