From fdf02ac2cd0e5b01f3a6a76046606ba4cb2929f3 Mon Sep 17 00:00:00 2001 From: "cpu@google.com" Date: Tue, 9 Dec 2008 23:16:58 +0000 Subject: First run is going into infinite recursion if started from master prefs - keeps creating importer processes - the issue is the creation of the first run sentinel file needs to happen before starting the new process. BUG=1535947 Review URL: http://codereview.chromium.org/13312 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6651 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/first_run.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'chrome/browser/first_run.cc') diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index ff046fa..c6f4f29 100755 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -205,6 +205,12 @@ bool FirstRun::ProcessMasterPreferences( // required state given that FirstRunView is not going to be called. FirstRun::SetShowFirstRunBubblePref(); + // We need to be able to create the first run sentinel or else we cannot + // proceed because ImportSettings will launch the importer process which + // would end up here if the sentinel is not present. + if (!FirstRun::CreateSentinel()) + return false; + if (parse_result & installer_util::MASTER_PROFILE_SHOW_WELCOME) FirstRun::SetShowWelcomePagePref(); @@ -222,7 +228,6 @@ bool FirstRun::ProcessMasterPreferences( } } - FirstRun::CreateSentinel(); return false; } -- cgit v1.1