diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs index 4ce7f688fa..23eb98a564 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs @@ -45,10 +45,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - debugger.Initialize += delegate { - InitializeDebugger(); - }; - breakpointsList = new ListView(); breakpointsList.FullRowSelect = true; breakpointsList.AutoArrange = true; @@ -65,6 +61,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads path.Width = 400; RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs index 5eeb463efd..99f0f40f3c 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs @@ -45,10 +45,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - debugger.Initialize += delegate { - InitializeDebugger(); - }; - callStackList = new ListView(); callStackList.FullRowSelect = true; callStackList.AutoArrange = true; @@ -63,6 +59,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads language.Width = 400; RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs index 4166e696a8..f4866def4b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs @@ -45,10 +45,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads void InitializeComponents() { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - - debugger.Initialize += delegate { - InitializeDebugger(); - }; exceptionHistoryList = new ListView(); exceptionHistoryList.FullRowSelect = true; @@ -65,6 +61,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads time.Width = 80; RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs index 85a89c3709..744dc2a8e9 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs @@ -50,10 +50,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads void InitializeComponents() { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - - debugger.Initialize += delegate { - InitializeDebugger(); - }; loadedModulesList = new ListView(); loadedModulesList.FullRowSelect = true; @@ -74,6 +70,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads information.Width = 130; RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs index f80dbb67fe..f88f2ffca0 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs @@ -45,10 +45,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads void InitializeComponents() { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - - debugger.Initialize += delegate { - InitializeDebugger(); - }; ImageList imageList = new ImageList(); imageList.Images.Add(IconService.GetBitmap("Icons.16x16.Class")); @@ -72,6 +68,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads localVarList.BeforeExpand += new TreeListViewCancelEventHandler(localVarList_BeforeExpand); RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs index 6d049abf1d..3421357b31 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs @@ -47,10 +47,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads void InitializeComponents() { debugger = (WindowsDebugger)DebuggerService.CurrentDebugger; - - debugger.Initialize += delegate { - InitializeDebugger(); - }; runningThreadsList = new ListView(); runningThreadsList.FullRowSelect = true; @@ -69,6 +65,14 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads breaked.Width = 80; RedrawContent(); + + if (debugger.ServiceInitialized) { + InitializeDebugger(); + } else { + debugger.Initialize += delegate { + InitializeDebugger(); + }; + } } public void InitializeDebugger() diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs index b70e199fc9..0e8db1d2d0 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs @@ -117,6 +117,12 @@ namespace ICSharpCode.SharpDevelop.Services MessageViewCategory messageViewCategoryDebuggerLog; public Thread selectedThread; public Function selectedFunction; + + public bool ServiceInitialized { + get { + return serviceInitialized; + } + } public bool CanDebug(IProject project) {