Browse Source

Fixed possible StackOverflowException in pad creation.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@939 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
cd7eeedc53
  1. 14
      src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs
  2. 11
      src/Main/Core/Project/Src/Services/ResourceService/ResourceService.cs

14
src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs

@ -16,7 +16,8 @@ namespace ICSharpCode.Core @@ -16,7 +16,8 @@ namespace ICSharpCode.Core
public class PadDescriptor : IDisposable
{
Codon codon;
IPadContent padContent = null;
IPadContent padContent;
bool padContentCreated;
/// <summary>
/// Returns the title of the pad.
@ -64,17 +65,13 @@ namespace ICSharpCode.Core @@ -64,17 +65,13 @@ namespace ICSharpCode.Core
public bool HasFocus {
get {
if (padContent == null) {
return false;
}
return padContent.Control.ContainsFocus;
return (padContent != null) ? padContent.Control.ContainsFocus : false;
}
}
public IPadContent PadContent {
get {
if (padContent == null) CreatePad();
CreatePad();
return padContent;
}
}
@ -96,7 +93,8 @@ namespace ICSharpCode.Core @@ -96,7 +93,8 @@ namespace ICSharpCode.Core
public void CreatePad()
{
if (padContent == null) {
if (!padContentCreated) {
padContentCreated = true;
padContent = (IPadContent)codon.AddIn.CreateObject(Class);
}
}

11
src/Main/Core/Project/Src/Services/ResourceService/ResourceService.cs

@ -43,7 +43,16 @@ namespace ICSharpCode.Core @@ -43,7 +43,16 @@ namespace ICSharpCode.Core
ResourceService.resourceDirectory = resourceDirectory;
PropertyService.PropertyChanged += new PropertyChangedEventHandler(OnPropertyChange);
LoadLanguageResources(PropertyService.Get(uiLanguageProperty, Thread.CurrentThread.CurrentUICulture.Name));
LoadLanguageResources(ResourceService.Language);
}
public static string Language {
get {
return PropertyService.Get(uiLanguageProperty, Thread.CurrentThread.CurrentUICulture.Name);
}
set {
PropertyService.Set(uiLanguageProperty, value);
}
}
/// <summary>English strings (list of resource managers)</summary>

Loading…
Cancel
Save