Merge branch 'dev' into ss/impl

2021-01-10 20:52:04 +03:00 · 2021-01-10 20:52:04 +03:00 · ba686556d2
commit ba686556d2
parent 15dc6eaaf8 3369a387ce
11 changed files with 126 additions and 96 deletions
--- a/client/protocols/openvpnprotocol.cpp
+++ b/client/protocols/openvpnprotocol.cpp
@ -226,6 +226,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
            else {
                emit protocolError(ErrorCode::OpenVpnUnknownError);
            }
+            return;
        }

        QByteArray data(line.toStdString().c_str());