From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Sat, 23 Apr 2016 16:02:49 +0000 (+0300)
Subject: conlog: windoze crlf fix
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=6d5d8defe18ab09fd22c22261e87c41e5af3fabc;p=d2df-sdl.git

conlog: windoze crlf fix
---

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index 472bd57..6391f24 100644
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -136,11 +136,6 @@ begin
   wcr := (tf.userData[udWasCR] <> 0);
   while count > 0 do
   begin
-    if wcr then
-    begin
-      wcr := false;
-      if buf^ = #10 then continue;
-    end;
     // look for some special char
     ep := buf;
     f := 0;
@@ -156,6 +151,7 @@ begin
     end;
     if f > 0 then
     begin
+      wcr := false;
       cbufPutChars(buf, f);
       Inc(buf, f);
       Dec(count, f);
@@ -184,9 +180,12 @@ begin
 {$IFDEF CBLOG}
       writeln(stderr);
 {$ENDIF}
-      wcr := (ch = #13);
-      x := 0;
-      cbufPut(#10);
+      if not wcr or (ch <> #10) then
+      begin
+        wcr := (ch = #13);
+        x := 0;
+        cbufPut(#10);
+      end;
       continue;
     end;
   end;