diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-05 13:17:42 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-05 13:17:42 +0100 |
| commit | 613c01dab5222a99fa642a466ce37ade53f1c072 (patch) | |
| tree | 76e7397ed67679d168a40b36035d898b406b1430 /gui/MainWindow.cpp | |
| parent | 76f58eb42ccc2c19f6952cbae501c17c06c3671b (diff) | |
| download | MultiMC-613c01dab5222a99fa642a466ce37ade53f1c072.tar MultiMC-613c01dab5222a99fa642a466ce37ade53f1c072.tar.gz MultiMC-613c01dab5222a99fa642a466ce37ade53f1c072.tar.lz MultiMC-613c01dab5222a99fa642a466ce37ade53f1c072.tar.xz MultiMC-613c01dab5222a99fa642a466ce37ade53f1c072.zip | |
Some more updater fixes
Paths were wrong - still used work directory instead of root
Diffstat (limited to 'gui/MainWindow.cpp')
| -rw-r--r-- | gui/MainWindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index cb9171f1..35c4ee15 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -568,10 +568,14 @@ void MainWindow::downloadUpdates(QString repo, int versionId, bool installOnExit // If the task succeeds, install the updates. if (updateDlg.exec(&updateTask)) { + UpdateFlags baseFlags = None; + #ifdef MultiMC_UPDATER_DRY_RUN + baseFlags |= DryRun; + #endif if (installOnExit) - MMC->setUpdateOnExit(updateTask.updateFilesDir()); + MMC->installUpdates(updateTask.updateFilesDir(), baseFlags | OnExit); else - MMC->installUpdates(updateTask.updateFilesDir(), true); + MMC->installUpdates(updateTask.updateFilesDir(), baseFlags | RestartOnFinish); } } |