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/pages/ModFolderPage.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/pages/ModFolderPage.cpp')
| -rw-r--r-- | application/pages/ModFolderPage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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 ¤t, const QModelIndex &previous) |