From 8fbb12310ea9be59420f59406e3d3054686d2a2c Mon Sep 17 00:00:00 2001 From: Jessica James Date: Fri, 23 Dec 2016 18:34:47 -0500 Subject: [PATCH] Minor bug fix where newline was getting appended to line, rather than truncating \r --- .gitignore | 1 + Jupiter/IRC_Client.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7920902..88eb79b 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ $RECYCLE.BIN/ # Visual Studio DB *.VC.db +/.vs/config/applicationhost.config diff --git a/Jupiter/IRC_Client.cpp b/Jupiter/IRC_Client.cpp index e33f92d..dadaf4a 100644 --- a/Jupiter/IRC_Client.cpp +++ b/Jupiter/IRC_Client.cpp @@ -1391,11 +1391,12 @@ int Jupiter::IRC::Client::think() { if (result.tokens[0][0] == '\n' && Jupiter::IRC::Client::data_->last_line[Jupiter::IRC::Client::data_->last_line.size() - 1] == '\r') { - Jupiter::IRC::Client::data_->last_line += '\n'; - Jupiter::IRC::Client::process_line(Jupiter::IRC::Client::data_->last_line); + Jupiter::IRC::Client::data_->last_line.truncate(1); // Remove \r + Jupiter::IRC::Client::process_line(Jupiter::IRC::Client::data_->last_line); Jupiter::IRC::Client::data_->last_line.erase(); - result.tokens[0].shiftRight(1); + + result.tokens[0].shiftRight(1); // Remove \n } }