Browse Source

Fixed null reference if no project is opened while editing a breakpoint.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5233 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Siegfried Pammer 16 years ago
parent
commit
1e97dc079e
  1. 9
      src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs

9
src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs

@ -43,12 +43,15 @@ namespace Debugger.AddIn.Service @@ -43,12 +43,15 @@ namespace Debugger.AddIn.Service
foreach (var name in Enum.GetNames(typeof(SupportedLanguage)))
cmbLanguage.Items.Add(name);
LoggingService.Debug(ProjectService.CurrentProject.Language);
string language = "CSharp";
if (ProjectService.CurrentProject != null)
language = ProjectService.CurrentProject.Language.Replace("#", "Sharp");
this.cmbLanguage.SelectedIndex =
(!string.IsNullOrEmpty(data.ScriptLanguage)) ?
this.cmbLanguage.Items.IndexOf(data.ScriptLanguage) :
this.cmbLanguage.Items.IndexOf(ProjectService.CurrentProject.Language.Replace("#", "Sharp"));
this.cmbLanguage.Items.IndexOf(language);
this.codeEditor.Document.Text = data.Condition;
@ -57,7 +60,7 @@ namespace Debugger.AddIn.Service @@ -57,7 +60,7 @@ namespace Debugger.AddIn.Service
void UpdateHighlighting()
{
codeEditor.SyntaxHighlighting = HighlightingManager.Instance.GetDefinitionByExtension("." + cmbLanguage.SelectedValue.ToString().Substring(0, 2));
codeEditor.SyntaxHighlighting = HighlightingManager.Instance.GetDefinition(this.cmbLanguage.SelectedItem.ToString().Replace("Sharp", "#"));
}
bool CheckSyntax()

Loading…
Cancel
Save