Browse Source

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
shortcuts
Daniel Grunwald 20 years ago
parent
commit
c7eb2454fd
  1. 10
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs

10
src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs

@ -50,12 +50,16 @@ namespace HtmlHelp2.SharpDevLanguageClass
public static bool CheckTopicLanguage(IHxTopic topic) 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) 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; } if (topic == null) { return false; }
string tempLanguage = String.Empty; string tempLanguage = String.Empty;
@ -90,7 +94,7 @@ namespace HtmlHelp2.SharpDevLanguageClass
{ {
string tempLanguage = expectedLanguage; string tempLanguage = expectedLanguage;
if (tempLanguage != String.Empty) if (!string.IsNullOrEmpty(tempLanguage))
{ {
if (!languages.ContainsKey(expectedLanguage) || if (!languages.ContainsKey(expectedLanguage) ||
!languages.TryGetValue(expectedLanguage, out tempLanguage)) !languages.TryGetValue(expectedLanguage, out tempLanguage))

Loading…
Cancel
Save