Browse Source

Merge pull request #95 from robbyz-az/master

Fix for Clipboard Paste Bug
Lloyd Weehuizen 13 years ago
parent
commit
15e3bace1f
1 changed files with 4 additions and 0 deletions
  1. 4 0
      Source/Controls/Clipboard.cpp

+ 4 - 0
Source/Controls/Clipboard.cpp

@@ -76,13 +76,17 @@ Core::WString Clipboard::Get()
 
 		HANDLE clipboard_data = GetClipboardData(CF_UNICODETEXT);
 		if (clipboard_data == NULL)
+		{
+			CloseClipboard();
 			return clipboard_content;
+		}
 
 		const Rocket::Core::word* clipboard_text = (const Rocket::Core::word*) GlobalLock(clipboard_data);
 		if (clipboard_text)
 			clipboard_content.Assign(clipboard_text);
 		GlobalUnlock(clipboard_data);
 
+		CloseClipboard();
 		return clipboard_content;
 	}
 	else