From 3ee237e736169307409c545a3e64d6859bc69ce2 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 23 Sep 2022 15:45:39 +0100
Subject: [PATCH] Fix logfile/directory opening in Windows

---
 loggingwindow.cpp | 46 ++++++++++++++++++++++++----------------------
 loggingwindow.h   |  3 +++
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/loggingwindow.cpp b/loggingwindow.cpp
index c9ad5be..c9c6b67 100644
--- a/loggingwindow.cpp
+++ b/loggingwindow.cpp
@@ -142,37 +142,39 @@ void loggingWindow::on_clearDisplayBtn_clicked()
 void loggingWindow::on_openDirBtn_clicked()
 {
     QString cmd;
-    int rtnval = 0;
-#ifdef Q_OS_MAC
-    cmd = "open " + logDirectory;
-#endif
+    bool rtn = false;
+    QStringList arg;
+    const QFileInfo dir(logDirectory);
+
 #ifdef Q_OS_LINUX
-    cmd = "xdg-open " + logDirectory;
+    cmd = "xdg-open";
+#elif defined(Q_OS_WIN)
+    cmd = QStandardPaths::findExecutable("explorer.exe");
+    if (!dir.isDir())
+        arg += QLatin1String("/select,");
+#else
+    cmd = "open";
 #endif
-#ifdef Q_OS_WIN
-    cmd = "start " + logDirectory;
-#endif
-    rtnval = system(cmd.toLocal8Bit().data());
-    if(rtnval)
-        qInfo(logLogger()) << "Error, open log directory command returned error code " << rtnval;
+    arg += QDir::toNativeSeparators(dir.canonicalFilePath());;
+    rtn = QProcess::startDetached(cmd, arg);
+    if(!rtn)
+        qInfo(logLogger()) << "Error, open log directory" << logDirectory << "command failed";
 }
 
 void loggingWindow::on_openLogFileBtn_clicked()
 {
     QString cmd;
-    int rtnval = 0;
-#ifdef Q_OS_MAC
-    cmd = "open " + logFilename;
-#endif
+    bool rtn = false;
 #ifdef Q_OS_LINUX
-    cmd = "xdg-open " + logFilename;
+    cmd = "xdg-open";
+#elif defined(Q_OS_WIN)
+    cmd = QStandardPaths::findExecutable("notepad.exe");
+#else
+    cmd = "open";
 #endif
-#ifdef Q_OS_WIN
-    cmd = "notepad " + logFilename;
-#endif
-    rtnval = system(cmd.toLocal8Bit().data());
-    if(rtnval)
-        qInfo(logLogger()) << "Error, open log file command returned error code " << rtnval;
+    rtn = QProcess::startDetached(cmd, { logFilename });
+    if(!rtn)
+        qInfo(logLogger()) << "Error, open log file command failed";
 }
 
 void loggingWindow::on_sendToPasteBtn_clicked()
diff --git a/loggingwindow.h b/loggingwindow.h
index dda0efa..de11348 100644
--- a/loggingwindow.h
+++ b/loggingwindow.h
@@ -10,6 +10,9 @@
 #include <QTextStream>
 #include <QMessageBox>
 #include <QScrollBar>
+#include <QProcess>
+#include <QFileInfo>
+#include <QDir>
 
 #include "logcategories.h"