From c7eb2454fd39732932dceb3de8387f316608e0ed Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 15 Jan 2006 17:10:00 +0000 Subject: [PATCH] Fixed exception in dynamic help pad when language of current project was unknown (e.g. project file not found) git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@994 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/src/Service/SharpDevLanguageClass.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs index f552fc1559..69514713bf 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs @@ -50,12 +50,16 @@ namespace HtmlHelp2.SharpDevLanguageClass public static bool CheckTopicLanguage(IHxTopic topic) { - return CheckTopicLanguage(topic, ProjectService.CurrentProject.Language); + if (ProjectService.CurrentProject != null) { + return CheckTopicLanguage(topic, ProjectService.CurrentProject.Language); + } else { + return true; + } } public static bool CheckTopicLanguage(IHxTopic topic, string expectedLanguage) { - if (expectedLanguage == String.Empty) { return true; } + if (string.IsNullOrEmpty(expectedLanguage)) { return true; } if (topic == null) { return false; } string tempLanguage = String.Empty; @@ -90,7 +94,7 @@ namespace HtmlHelp2.SharpDevLanguageClass { string tempLanguage = expectedLanguage; - if (tempLanguage != String.Empty) + if (!string.IsNullOrEmpty(tempLanguage)) { if (!languages.ContainsKey(expectedLanguage) || !languages.TryGetValue(expectedLanguage, out tempLanguage))