Commit 3562e602 authored by Lorenz Meier's avatar Lorenz Meier

Not auto-overwriting links, ignoring carriage return in console

parent c9a76441
......@@ -419,7 +419,9 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes)
}
else
{
str.append(byte); // Append original character
// Ignore carriage return, because that
// is auto-added with '\n'
if (byte != '\r') str.append(byte); // Append original character
lastSpace = 0;
}
}
......
......@@ -212,11 +212,6 @@ void SerialConfigurationWindow::setupPortList()
{
if (!link) return;
if (!userConfigured)
{
ui.portName->clear();
ui.portName->clearEditText();
}
// Get the ports available on this system
QVector<QString>* ports = link->getCurrentPorts();
......@@ -231,7 +226,6 @@ void SerialConfigurationWindow::setupPortList()
}
}
ui.portName->setEditText(this->link->getPortName());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment