Browse Source

Merge remote-tracking branch 'Gordon-F/Gordon-F-patch-1'

Lasse Öörni 9 years ago
parent
commit
ba423dd5de
1 changed files with 1 additions and 2 deletions
  1. 1 2
      Source/Urho3D/Container/Str.cpp

+ 1 - 2
Source/Urho3D/Container/Str.cpp

@@ -1014,10 +1014,9 @@ unsigned String::DecodeUTF16(const wchar_t*& src)
     if (src == 0)
         return 0;
     
-    unsigned short word1 = *src;
+    unsigned short word1 = *src++;
     
     // Check if we are at a low surrogate
-    word1 = *src++;
     if (word1 >= 0xdc00 && word1 < 0xe000)
     {
         while (*src >= 0xdc00 && *src < 0xe000)