Index: Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs =================================================================== diff -u -r02168ebd32424310c7982f5185d67ce56ed52bd8 -r0619b0f5ad27c9042518823db3e2da8def7a6df5 --- Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs (.../MessageWindow.cs) (revision 02168ebd32424310c7982f5185d67ce56ed52bd8) +++ Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs (.../MessageWindow.cs) (revision 0619b0f5ad27c9042518823db3e2da8def7a6df5) @@ -59,6 +59,7 @@ private readonly ConcurrentQueue newMessages = new ConcurrentQueue(); private bool filtering; + private bool copying; /// /// Creates a new instance of . @@ -348,7 +349,7 @@ private void MessagesDataGridViewCellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.Value == null) + if (e.Value == null || copying) { return; } @@ -381,7 +382,9 @@ private void ButtonCopyClick(object sender, EventArgs e) { + copying = true; ClipboardProvider.Clipboard.SetDataObject(messagesDataGridView.GetClipboardContent()); + copying = false; } private void ButtonShowDetailsClick(object sender, EventArgs e) Index: Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs =================================================================== diff -u -rc84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c -r0619b0f5ad27c9042518823db3e2da8def7a6df5 --- Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision c84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c) +++ Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision 0619b0f5ad27c9042518823db3e2da8def7a6df5) @@ -38,7 +38,7 @@ private MessageWindowLogAppender originalValue; [Test] - public void ParameteredConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Setup var logAppender = new MessageWindowLogAppender(); @@ -441,7 +441,7 @@ IDataObject actualDataObject = ClipboardProvider.Clipboard.GetDataObject(); Assert.IsTrue(actualDataObject != null && actualDataObject.GetDataPresent(DataFormats.Text)); var actualContent = (string) actualDataObject.GetData(DataFormats.Text); - Assert.AreEqual("\t00:00:00\tmessage", actualContent); + Assert.AreEqual("WARN\t\tmessage\t00:00:00", actualContent); } }