diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-07-23 16:13:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 16:13:32 +0200 |
| commit | 0c466bc530dc7e6da12d678d01677dfb23bdda92 (patch) | |
| tree | adc2509a27827dd29d89d4dd6c96d828ca3a23da /application/pages/global/MultiMCPage.cpp | |
| parent | b902c5cd7814f286a8b850762dc39a6d654300d2 (diff) | |
| parent | e883cf2359428a46970437d0fa5fee676f130fcd (diff) | |
| download | PrismLauncher-0c466bc530dc7e6da12d678d01677dfb23bdda92.tar.gz PrismLauncher-0c466bc530dc7e6da12d678d01677dfb23bdda92.tar.bz2 PrismLauncher-0c466bc530dc7e6da12d678d01677dfb23bdda92.zip | |
Merge pull request #3919 from hamarb123/develop
Stop application freezes on macOS by moving data to MultiMC.app/Data
Diffstat (limited to 'application/pages/global/MultiMCPage.cpp')
| -rw-r--r-- | application/pages/global/MultiMCPage.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index 80d5c544..d383e6ed 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -29,6 +29,9 @@ #include "BuildConfig.h" #include "themes/ITheme.h" +#include <QApplication> +#include <QProcess> + // FIXME: possibly move elsewhere enum InstSortMode { @@ -78,6 +81,13 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP } connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview())); connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview())); + + //move mac data button + QFile file(QDir::current().absolutePath() + "/dontmovemacdata"); + if (!file.exists()) + { + ui->migrateDataFolderMacBtn->setVisible(false); + } } MultiMCPage::~MultiMCPage() @@ -146,6 +156,13 @@ void MultiMCPage::on_modsDirBrowseBtn_clicked() ui->modsDirTextBox->setText(cooked_dir); } } +void MultiMCPage::on_migrateDataFolderMacBtn_clicked() +{ + QFile file(QDir::current().absolutePath() + "/dontmovemacdata"); + file.remove(); + QProcess::startDetached(qApp->arguments()[0]); + qApp->quit(); +} void MultiMCPage::refreshUpdateChannelList() { |