From 1ad0b068cde64a1d7a5676757640e480454bdd93 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 22 Oct 2020 12:09:32 +0300
Subject: [PATCH] Improve oneline.

GitOrigin-RevId: 6cec8e407f0f5eedb367aea25864033a69e1d1e5
---
 tdutils/td/utils/misc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tdutils/td/utils/misc.cpp b/tdutils/td/utils/misc.cpp
index 9d4b1415f..8954c9137 100644
--- a/tdutils/td/utils/misc.cpp
+++ b/tdutils/td/utils/misc.cpp
@@ -48,7 +48,7 @@ string oneline(Slice str) {
   result.reserve(str.size());
   bool after_new_line = true;
   for (auto c : str) {
-    if (c != '\n') {
+    if (c != '\n' && c != '\r') {
       if (after_new_line) {
         if (c == ' ') {
           continue;
@@ -56,7 +56,7 @@ string oneline(Slice str) {
         after_new_line = false;
       }
       result += c;
-    } else {
+    } else if (!after_new_line) {
       after_new_line = true;
       result += ' ';
     }