Merge remote-tracking branch 'Screwtapello/newlines-after-json-errors'

This commit is contained in:
Maxime Coste 2018-05-17 07:47:34 +10:00
commit b0577d07f6

View File

@ -460,7 +460,7 @@ void JsonUI::parse_requests(EventMode mode)
} }
catch (runtime_error& error) catch (runtime_error& error)
{ {
write(2, format("error while handling requests '{}': '{}'", write(2, format("error while handling requests '{}': '{}'\n",
m_requests, error.what())); m_requests, error.what()));
// try to salvage request by dropping its first line // try to salvage request by dropping its first line
pos = std::min(m_requests.end(), find(m_requests, '\n')+1); pos = std::min(m_requests.end(), find(m_requests, '\n')+1);