summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 05:05:25 +0000
committercpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 05:05:25 +0000
commitd577853166fb4adbfd777c22e7e13562ca90bac1 (patch)
tree0b66be82dcbeb4de287a8228370f48adb30b13d5
parent75964a02afa7863f58f56658780aef39e6378585 (diff)
downloadchromium_src-d577853166fb4adbfd777c22e7e13562ca90bac1.zip
chromium_src-d577853166fb4adbfd777c22e7e13562ca90bac1.tar.gz
chromium_src-d577853166fb4adbfd777c22e7e13562ca90bac1.tar.bz2
Quick fix to prevent double launch of chrome at install.
- According to docs we should not be writing InstallerSuccessLaunchCmdLine - Might affect gcapi BUG=1719600 Review URL: http://codereview.chromium.org/48120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11950 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/util/install_util.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 86f0847..e7f8f34 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -107,7 +107,9 @@ void InstallUtil::WriteInstallerResult(bool system_install,
install_list->AddSetRegValueWorkItem(root, key, L"InstallerResultUIString",
msg, true);
}
- if (launch_cmd != NULL) {
+ // TODO(rahulk) verify that the absence of InstallerSuccessLaunchCmdLine
+ // for non-system installs does not break the gcapi.dll.
+ if ((launch_cmd != NULL) && system_install) {
install_list->AddSetRegValueWorkItem(root, key,
L"InstallerSuccessLaunchCmdLine",
*launch_cmd, true);