ExceptionBox: fixed potential deadlock when exception occurred on non-GUI thread.

Added menu entries for "Edit > Insert > Paste as comment/string" (r3832)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3862 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -1282,8 +1282,18 @@
 			          type = "Item"
 			          loadclasslazy = "false"
 			          class = "ICSharpCode.SharpDevelop.Commands.Delete"/>
+			<MenuItem id = "Separator2" type = "Separator"  />
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
 				<MenuItem id = "Insert" label = "${res:XML.MainMenu.EditMenu.Insert}" type="Menu">
+					<MenuItem id = "PasteAsComment"
+					          label = "${res:XML.MainMenu.EditMenu.Paste.AsComment}"
+					          class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.PasteAsCommentCommand"/>
+					<MenuItem id = "PasteAsString"
+					          label = "${res:XML.MainMenu.EditMenu.Paste.AsString}"
+					          class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.PasteAsStringCommand"/>
+					
+					<MenuItem id="Separator1" type="Separator"/>
+					
 					<MenuItem id = "InsertColor"
 					          label = "${res:XML.MainMenu.ToolMenu.InsColor}"
 					          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowColorDialog"/>

src/AddIns/Misc/Profiler/X64Converter/X64Converter.csproj

@@ -17,6 +17,7 @@
     <NoStdLib>False</NoStdLib>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <OutputPath>bin\</OutputPath>
+    <StartWorkingDirectory>..\bin\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/Main/ICSharpCode.SharpDevelop.Sda/Src/ExceptionBox.cs

@@ -68,11 +68,10 @@ namespace ICSharpCode.SharpDevelop.Sda
 		{
 			try {
 				using (ExceptionBox box = new ExceptionBox(exception, message, mustTerminate)) {
-					try {
+					if (ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.InvokeRequired)
-						box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
-					} catch (InvalidOperationException) {
 						box.ShowDialog();
-					}
+					else
+						box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
 				}
 			} catch (Exception ex) {
 				LoggingService.Warn("Error showing ExceptionBox", ex);