From 9815697f230cd1d996e6eb0040e1e73aa6998f64 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 19 Oct 2008 00:44:29 +0000 Subject: [PATCH] Fixed build git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3606 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Base/Project/Src/TextEditor/ClipboardHandling.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs b/src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs index 401125ed27..24f03db1e5 100644 --- a/src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs +++ b/src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs @@ -22,7 +22,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor public static void Initialize() { ICSharpCode.TextEditor.TextAreaClipboardHandler.GetClipboardContainsText = GetClipboardContainsText; - WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated; + if (WorkbenchSingleton.MainForm != null) { + WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated; + } else { + WorkbenchSingleton.WorkbenchCreated += delegate { + WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated; + }; + } } static void WorkbenchSingleton_MainForm_Activated(object sender, EventArgs e) @@ -35,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor public static bool GetClipboardContainsText() { WorkbenchSingleton.DebugAssertMainThread(); - if (WorkbenchSingleton.Workbench.IsActiveWindow) { + if (WorkbenchSingleton.Workbench != null && WorkbenchSingleton.Workbench.IsActiveWindow) { UpdateClipboardContainsText(); } return clipboardContainsText;