From 4d0caf6254fdb18f4626a3c7937e64422b40d40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 5 Jan 2016 07:32:52 +0100
Subject: 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
---
 logic/tools/MCEditTool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'logic/tools')

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
 }
-- 
cgit v1.2.3