X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Fenvvars.pas;h=a15feef0e1dc37e4cddde1038c004a390d33a92b;hb=refs%2Fheads%2Fmob;hp=a76315f42d40f9ddfc84f2d8ecead137bcd2cd2d;hpb=987c4a835a103345b59937e8e1be8524a6228712;p=d2df-sdl.git

diff --git a/src/shared/envvars.pas b/src/shared/envvars.pas
index a76315f..a15feef 100644
--- 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.