From a415eb8cbd07c03c3a01733d12f3a546be493bab Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 20 May 2009 02:52:17 +0000 Subject: * browser.cs: Browser.GetHtml() needs to cope with RootTree.RenderUrl() returning a null match node, which can happen because an EcmaUncompiledHelpSource always sets the match node to null, but will return a non-null string. Fixes #505476. svn path=/trunk/mono-tools/; revision=134434 --- docbrowser/ChangeLog | 7 +++++++ docbrowser/browser.cs | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'docbrowser') diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index 2067f120..96de5b98 100755 --- a/docbrowser/ChangeLog +++ b/docbrowser/ChangeLog @@ -1,3 +1,10 @@ +2009-04-25 Jonathan Pryor + + * browser.cs: Browser.GetHtml() needs to cope with + RootTree.RenderUrl() returning a null match node, which can happen + because an EcmaUncompiledHelpSource always sets the match node to + null, but will return a non-null string. Fixes #505476. + 2009-04-30 Marek Habersack * browser.cs: NodePageVisit.Go () - it seems n.tree is almost diff --git a/docbrowser/browser.cs b/docbrowser/browser.cs index 40f2ff69..44b21e2d 100644 --- a/docbrowser/browser.cs +++ b/docbrowser/browser.cs @@ -868,9 +868,9 @@ ExtLoop: string html_content = null; if (help_source != null) html_content = help_source.GetText (url, out match); - if (html_content == null) { + if (html_content == null && help_tree != null) { html_content = help_tree.RenderUrl (url, out match); - if (html_content != null) + if (html_content != null && match != null && match.tree != null) help_source = match.tree.HelpSource; } -- cgit v1.2.3