Merge pull request #4468 from otaviobp/socket_error

Fix crash by invalid socket deletion

Merge pull request #4468 from otaviobp/socket_error
Fix crash by invalid socket deletion
a8240d22 · Gus Grubba · GitHub · 6422b180 · a84be5e6 · a8240d22
Commit a8240d22 authored Jan 25, 2017 by Gus Grubba Committed by GitHub Jan 25, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

VideoReceiver.cc src/VideoStreaming/VideoReceiver.cc +2 -2

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