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
---
 application/pages/ModFolderPage.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'application/pages/ModFolderPage.cpp')

diff --git a/application/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp
index 6791a59e..3c68b23f 100644
--- a/application/pages/ModFolderPage.cpp
+++ b/application/pages/ModFolderPage.cpp
@@ -19,7 +19,6 @@
 #include <QMessageBox>
 #include <QEvent>
 #include <QKeyEvent>
-#include <QDesktopServices>
 #include <QAbstractItemModel>
 
 #include "MultiMC.h"
@@ -29,7 +28,7 @@
 #include "minecraft/ModList.h"
 #include "minecraft/Mod.h"
 #include "minecraft/VersionFilterData.h"
-#include <FileSystem.h>
+#include <DesktopServices.h>
 
 ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
 							 QString iconName, QString displayName, QString helpPage,
@@ -162,7 +161,7 @@ void ModFolderPage::on_rmModBtn_clicked()
 
 void ModFolderPage::on_viewModBtn_clicked()
 {
-	FS::openDirInDefaultProgram(m_mods->dir().absolutePath(), true);
+	DesktopServices::openDirectory(m_mods->dir().absolutePath(), true);
 }
 
 void ModFolderPage::modCurrent(const QModelIndex &current, const QModelIndex &previous)
-- 
cgit v1.2.3