Browse Source

Merge pull request #4468 from otaviobp/socket_error

Fix crash by invalid socket deletion
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
commit
a8240d225b
  1. 4
      src/VideoStreaming/VideoReceiver.cc

4
src/VideoStreaming/VideoReceiver.cc

@ -80,7 +80,7 @@ void VideoReceiver::_connected()
{ {
//-- Server showed up. Now we start the stream. //-- Server showed up. Now we start the stream.
_timer.stop(); _timer.stop();
delete _socket; _socket->deleteLater();
_socket = NULL; _socket = NULL;
_serverPresent = true; _serverPresent = true;
start(); start();
@ -91,7 +91,7 @@ void VideoReceiver::_connected()
void VideoReceiver::_socketError(QAbstractSocket::SocketError socketError) void VideoReceiver::_socketError(QAbstractSocket::SocketError socketError)
{ {
Q_UNUSED(socketError); Q_UNUSED(socketError);
delete _socket; _socket->deleteLater();
_socket = NULL; _socket = NULL;
//-- Try again in 5 seconds //-- Try again in 5 seconds
_timer.start(5000); _timer.start(5000);

Loading…
Cancel
Save