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
87969022
Commit
87969022
authored
Dec 09, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More rigor in thread tear down
parent
4abafb46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
GAudioOutput.cc
src/GAudioOutput.cc
+2
-4
QGCAudioWorker.cpp
src/audio/QGCAudioWorker.cpp
+1
-0
No files found.
src/GAudioOutput.cc
View file @
87969022
...
...
@@ -77,10 +77,8 @@ GAudioOutput::~GAudioOutput()
while
(
thread
->
isRunning
())
{
QGC
::
SLEEP
::
usleep
(
100
);
}
worker
->
deleteLater
();
thread
->
deleteLater
();
worker
=
NULL
;
thread
=
NULL
;
delete
worker
;
delete
thread
;
}
...
...
src/audio/QGCAudioWorker.cpp
View file @
87969022
...
...
@@ -90,6 +90,7 @@ QGCAudioWorker::~QGCAudioWorker()
pVoice
=
NULL
;
::
CoUninitialize
();
#endif
delete
emergencyTimer
;
}
void
QGCAudioWorker
::
say
(
QString
text
,
int
severity
)
...
...
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