Merge pull request #3785 from livecodefraser/bugfix-16790

peter-b · peter-b · commit 26873a203d90 · 2016-03-23T09:18:12.000Z
Remove extraneous newline from clipboardData["files"] on Windows
diff --git a/docs/notes/bugfix-16790.md b/docs/notes/bugfix-16790.md
@@ -0,0 +1 @@
+# Remove extraneous newline from clipboardData["files"] on Windows
diff --git a/engine/src/w32-clipboard.cpp b/engine/src/w32-clipboard.cpp
@@ -300,10 +300,11 @@ MCStringRef MCWin32RawClipboardCommon::DecodeTransferredFileList(MCDataRef p_dat
 	else 
 		MCStringCreateWithBytes(t_bytes, t_path_char_count*1, kMCStringEncodingNative, false, t_decoded);
 
-	// Replace the NULs with newlines
+	// Replace the NULs with newlines and trim the trailing newline
 	if (t_decoded != NULL 
 		&& (!MCStringMutableCopyAndRelease(t_decoded, t_decoded)
 		|| !MCStringFindAndReplaceChar(t_decoded, '\0', '\n', kMCStringOptionCompareExact)
+		|| !MCStringRemove(t_decoded, MCRangeMake(MCStringGetLength(t_decoded)-1, 1))
 		|| !MCStringCopyAndRelease(t_decoded, t_decoded)))
 	{
 		MCValueRelease(t_decoded);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Remove extraneous newline from clipboardData["files"] on Windows`