From 9e2caea36f2a69a7cafc5f34d0ebb87ade78d254 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Tue, 3 Dec 2013 09:23:14 +0100 Subject: Fix hang at end of installation. Task-number: QTIFW-416 Task-number: QTCREATORBUG-10974 Change-Id: Ib2759cda2e24915880e134a13af126572094bd66 Reviewed-by: Eike Ziller --- .../org.qtproject.qtcreator.application/meta/installscript.qs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dist') diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs index 8e9bbfbb4d..5705d5a6f1 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs @@ -191,8 +191,9 @@ function isRoot() Component.prototype.installationFinishedPageIsShown = function() { + isroot = isRoot(); try { - if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) { + if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) { installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished ); } } catch(e) { @@ -203,7 +204,7 @@ Component.prototype.installationFinishedPageIsShown = function() Component.prototype.installationFinished = function() { try { - if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) { + if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) { var isLaunchQtCreatorCheckBoxChecked = component.userInterface("LaunchQtCreatorCheckBoxForm").launchQtCreatorCheckBox.checked; if (isLaunchQtCreatorCheckBoxChecked) installer.executeDetached(component.qtCreatorBinaryPath, new Array(), "@homeDir@"); -- cgit v1.2.1