From 613c01dab5222a99fa642a466ce37ade53f1c072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 5 Jan 2014 13:17:42 +0100
Subject: Some more updater fixes

Paths were wrong - still used work directory instead of root
---
 gui/MainWindow.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gui/MainWindow.cpp')

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);
 	}
 }
 
-- 
cgit v1.2.3