Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a8240d22
Commit
a8240d22
authored
Jan 25, 2017
by
Gus Grubba
Committed by
GitHub
Jan 25, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4468 from otaviobp/socket_error
Fix crash by invalid socket deletion
parents
6422b180
a84be5e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+2
-2
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
a8240d22
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment