diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-03 00:18:21 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-03 00:18:21 +0000 |
| commit | 040aa40caee63b733c146f91cf59b85a4a946033 (patch) | |
| tree | ecd7c8995731e300d3f14d4c09a7046d374073af /chrome/browser/views | |
| parent | 729065e3cfedd4db3db21d4b485527be2eff4d3e (diff) | |
| download | chromium_src-040aa40caee63b733c146f91cf59b85a4a946033.zip chromium_src-040aa40caee63b733c146f91cf59b85a4a946033.tar.gz chromium_src-040aa40caee63b733c146f91cf59b85a4a946033.tar.bz2 | |
Fixes crash in making Chrome the default browser from the options
dialog. The crash happened if you clicked 'make chrome the default',
then closed the window before we verified the choice stuck.
BUG=1355679
TEST=make sure setting chrome as the default browser still works.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/options/general_page_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 349fb5f..a231872 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -148,8 +148,10 @@ void GeneralPageView::DefaultBrowserWorker::ExecuteSetAsDefaultBrowser() { void GeneralPageView::DefaultBrowserWorker::CompleteSetAsDefaultBrowser() { DCHECK(MessageLoop::current() == ui_loop_); - // Set as default completed, check again to make sure it stuck... - StartCheckDefaultBrowser(); + if (general_page_view_) { + // Set as default completed, check again to make sure it stuck... + StartCheckDefaultBrowser(); + } } void GeneralPageView::DefaultBrowserWorker::UpdateUI(bool is_default) { |