[Orxonox-commit 1240] r5958 - code/trunk/src/libraries/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-10-16 09:52:10 +0200 (Fri, 16 Oct 2009)
New Revision: 5958

Modified:
   code/trunk/src/libraries/util/Clipboard.cc
Log:
Fixed a failed assertion on Windows, occurring when pasting from an empty clipboard.

Modified: code/trunk/src/libraries/util/Clipboard.cc
===================================================================
--- code/trunk/src/libraries/util/Clipboard.cc	2009-10-15 07:41:28 UTC (rev 5957)
+++ code/trunk/src/libraries/util/Clipboard.cc	2009-10-16 07:52:10 UTC (rev 5958)
@@ -93,6 +93,8 @@
             if (OpenClipboard(0))
             {
                 HANDLE hData = GetClipboardData(CF_TEXT);
+                if (hData == NULL)
+                    return "";
                 std::string output = static_cast<char*>(GlobalLock(hData));
                 GlobalUnlock(hData);
                 CloseClipboard();