diff options
| author | Niels Weber <niels.weber@digia.com> | 2013-12-03 09:23:14 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2013-12-03 10:29:55 +0100 |
| commit | 9e2caea36f2a69a7cafc5f34d0ebb87ade78d254 (patch) | |
| tree | 47361c06cf5066c0525828e21fe454cdab4c6281 /dist/installer | |
| parent | 796fcaf1d288267e93baba3d01927957c684758f (diff) | |
| download | qt-creator-9e2caea36f2a69a7cafc5f34d0ebb87ade78d254.tar.gz | |
Fix hang at end of installation.
Task-number: QTIFW-416
Task-number: QTCREATORBUG-10974
Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'dist/installer')
| -rw-r--r-- | dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs | 5 |
1 files changed, 3 insertions, 2 deletions
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@"); |