utils: fix encoding conversion utf8/cp1251

[d2df-sdl.git] / src / shared / envvars.pas

diff --git a/src/shared/envvars.pas b/src/shared/envvars.pas
index a76315f42d40f9ddfc84f2d8ecead137bcd2cd2d..a15feef0e1dc37e4cddde1038c004a390d33a92b 100644 (file)
--- a/src/shared/envvars.pas
+++ b/src/shared/envvars.pas
@@ -63,14 +63,8 @@ end;
     {$ELSE}
       Result := '';
     {$ENDIF}
-    (* invalidate username with non-cp1251 symbols *)
-    i := Low(Result);
-    while i <= High(Result) do
-    begin
-      if Result[i] = '?' then
-        Result := '';
-      Inc(i)
-    end
+    // Remove non 1251 chars
+    Result := StringReplace(Result, Invalid1251Char, '', [rfReplaceAll]);
   end;
 
 end.