From 2528c6e39a16af80df4d6aab301e500e75335cbe Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 1 Jul 2018 21:34:10 +0800
Subject: [PATCH] Fix python version detection

Closes #9146.
---
 src/base/utils/foreignapps.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/base/utils/foreignapps.cpp b/src/base/utils/foreignapps.cpp
index af45243e1..488d0c32c 100644
--- a/src/base/utils/foreignapps.cpp
+++ b/src/base/utils/foreignapps.cpp
@@ -31,6 +31,7 @@
 
 #include <QCoreApplication>
 #include <QProcess>
+#include <QRegularExpression>
 #include <QStringList>
 
 #include "base/logger.h"
@@ -56,8 +57,13 @@ namespace
             if (outputSplit.size() <= 1)
                 return false;
 
+            // User reports: `python --version` -> "Python 3.6.6+"
+            // So trim off unrelated characters
+            const QString versionStr = outputSplit[1];
+            const int idx = versionStr.indexOf(QRegularExpression("[^\\.\\d]"));
+
             try {
-                info = {exeName, outputSplit[1]};
+                info = {exeName, versionStr.left(idx)};
             }
             catch (const std::runtime_error &err) {
                 return false;