chrome/browser/instant/instant_controller.cc - Issue 7058022: Fixes crash with instant enabled. The crash would occur if you turned

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 7058022: Fixes crash with instant enabled. The crash would occur if you turned (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/instant/instant_controller.cc

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc

index 06bb4109299e3ad6a2da0a47eda9bc506125a984..a6fe03a9a87944d28d396d36461b3fa8b23cd96c 100644

--- a/chrome/browser/instant/instant_controller.cc

+++ b/chrome/browser/instant/instant_controller.cc

@@ -370,7 +370,7 @@ void InstantController::OnAutocompleteGotFocus(

return;

const TemplateURL* template_url = model->GetDefaultSearchProvider();

- if (!template_url)

+ if (!template_url || !template_url->instant_url())

return;

if (tab_contents != tab_contents_)

« no previous file with comments | « no previous file | no next file » | no next file with comments »