From 4d0caf6254fdb18f4626a3c7937e64422b40d40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= 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/WorldListPage.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'application/pages/WorldListPage.cpp') diff --git a/application/pages/WorldListPage.cpp b/application/pages/WorldListPage.cpp index 4e7eeedc..befb6b5e 100644 --- a/application/pages/WorldListPage.cpp +++ b/application/pages/WorldListPage.cpp @@ -16,7 +16,7 @@ #include "WorldListPage.h" #include "ui_WorldListPage.h" #include "minecraft/WorldList.h" -#include +#include #include "dialogs/ModEditDialogCommon.h" #include #include @@ -123,7 +123,7 @@ void WorldListPage::on_rmWorldBtn_clicked() void WorldListPage::on_viewFolderBtn_clicked() { - FS::openDirInDefaultProgram(m_worlds->dir().absolutePath(), true); + DesktopServices::openDirectory(m_worlds->dir().absolutePath(), true); } QModelIndex WorldListPage::getSelectedWorld() @@ -193,7 +193,8 @@ void WorldListPage::on_mcEditBtn_clicked() if(program.size()) { qint64 pid = 0; - QProcess::startDetached(program, QStringList() << fullPath, mceditPath, &pid); + + DesktopServices::openFile(program, fullPath, mceditPath, &pid); if(pid == 0) { QMessageBox::warning(this->parentWidget(), tr("MCEdit failed to start!"), tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")); -- cgit v1.2.3