[Wesnoth-cvs-commits] wesnoth/src clipboard.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <[EMAIL PROTECTED]>  05/03/11 11:59:08

Modified files:
        src            : clipboard.cpp 

Log message:
        fixed ucs2_string functions

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/clipboard.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: wesnoth/src/clipboard.cpp
diff -u wesnoth/src/clipboard.cpp:1.10 wesnoth/src/clipboard.cpp:1.11
--- wesnoth/src/clipboard.cpp:1.10      Fri Mar 11 11:49:25 2005
+++ wesnoth/src/clipboard.cpp   Fri Mar 11 11:59:07 2005
@@ -449,8 +449,10 @@
        str.reserve(scrapsize);
        str.resize(scrapsize);
        err = GetScrapFlavorData(scrap, kScrapFlavorTypeUnicode, &scrapsize, 
const_cast<Uint16*>(&str.front()));
-       if(err != noErr)
-               return str.clear();
+       if(err != noErr) {
+               str.clear();
+               return str;
+       }
        for(int i = 0; i < str.size(); ++i) {
                if(str[i] == '\r')
                        str[i] = '\n';