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 /logic/tools/MCEditTool.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 'logic/tools/MCEditTool.cpp')
-rw-r--r-- | logic/tools/MCEditTool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp index db45797f..f0f715c3 100644 --- a/logic/tools/MCEditTool.cpp +++ b/logic/tools/MCEditTool.cpp @@ -2,7 +2,6 @@ #include <QDir> #include <QProcess> -#include <QDesktopServices> #include <QUrl> // FIXME: mixing logic and UI!!!! #include <QInputDialog> @@ -11,6 +10,7 @@ #include "settings/SettingsObject.h" #include "BaseInstance.h" #include "minecraft/MinecraftInstance.h" +#include <DesktopServices.h> MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) : BaseDetachedTool(settings, instance, parent) @@ -84,7 +84,7 @@ void MCEditTool::runImpl() #endif if(program.size()) { - QProcess::startDetached(program, QStringList() << save, mceditPath); + DesktopServices::openFile(program, save, mceditPath); } #endif } |