diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-01-05 07:32:52 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-01-05 07:32:52 +0100 |
commit | 4d0caf6254fdb18f4626a3c7937e64422b40d40c (patch) | |
tree | 76b037c8f6b6c73f8438b85e8e05a2f59da89c17 /application/MultiMC.cpp | |
parent | d1e344f28f643c9fb0318feea0259be8ac72c8f7 (diff) | |
download | MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.gz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.lz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.xz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.zip |
GH-1389 wrap QDesktopServices and QProcess::startDetached
Essentially do not pass some environment variables to subprocesses:
* LD_PRELOAD
* LD_LIBRARY_PATH
* LD_DEBUG
* QT_PLUGIN_PATH
* QT_FONTPATH
Diffstat (limited to 'application/MultiMC.cpp')
-rw-r--r-- | application/MultiMC.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index a2a14506..fb82510d 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -17,7 +17,6 @@ #include <QLibraryInfo> #include <QMessageBox> #include <QStringList> -#include <QDesktopServices> #include <QDebug> #include "InstanceList.h" @@ -54,6 +53,7 @@ #include <Commandline.h> #include <FileSystem.h> +#include <DesktopServices.h> using namespace Commandline; @@ -932,12 +932,12 @@ bool MultiMC::openJsonEditor(const QString &filename) const QString file = QDir::current().absoluteFilePath(filename); if (m_settings->get("JsonEditor").toString().isEmpty()) { - return QDesktopServices::openUrl(QUrl::fromLocalFile(file)); + return DesktopServices::openUrl(QUrl::fromLocalFile(file)); } else { - return QProcess::startDetached(m_settings->get("JsonEditor").toString(), QStringList() - << file); + //return DesktopServices::openFile(m_settings->get("JsonEditor").toString(), file); + return DesktopServices::run(m_settings->get("JsonEditor").toString(), {}); } } |