Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
20ae84bf
Commit
20ae84bf
authored
8 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{input,mixer}/alsa: cancel the DeferredMonitor in the destructor
Yet another potential crash bug fix.
parent
7372c931
sisyphus
0.23.15-alt1
0.23.14-alt1
0.23.13-alt1
0.23.12-alt1
0.23.11-alt1
0.23.8-alt3
0.23.8-alt2
0.23.8-alt1
0.21.24-alt1.1
0.21.24-alt1
0.20.23-alt3
0.20.23-alt2
0.20.23-alt1
0.20.21-alt1
0.20.15-alt1
mpd/0.20.6-alt1
gb-sisyphus-task339776.6100
gb-sisyphus-task337393.100
gb-sisyphus-task337176.300
gb-sisyphus-task334590.100
gb-sisyphus-task333607.100
gb-sisyphus-task331543.2500
gb-sisyphus-task328663.4700
gb-sisyphus-task325064.100
gb-sisyphus-task319111.4000
gb-sisyphus-task313704.100
gb-sisyphus-task312885.100
gb-sisyphus-task308905.3200
gb-sisyphus-task305294.500
gb-sisyphus-task304007.100
gb-sisyphus-task303674.1700
gb-sisyphus-task298681.300
gb-sisyphus-task296051.1000
gb-sisyphus-task274827.100
gb-sisyphus-task269249.2000
gb-sisyphus-task266579.400
gb-sisyphus-task258132.600
gb-sisyphus-task254601.200
gb-sisyphus-task253310.100
gb-sisyphus-task252214.300
gb-sisyphus-task251539.6100
gb-sisyphus-task247988.7000
gb-sisyphus-task238768.6000
gb-sisyphus-task229151.100
gb-sisyphus-task227574.200
gb-sisyphus-task226762.6000
gb-sisyphus-task219546.1700
gb-sisyphus-task213491.100
gb-sisyphus-task198806.100
gb-sisyphus-task181400.100
gb-p9-task277538.2600
gb-c9f2-task327704.1100
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
AlsaInputPlugin.cxx
src/input/plugins/AlsaInputPlugin.cxx
+1
-0
AlsaMixerPlugin.cxx
src/mixer/plugins/AlsaMixerPlugin.cxx
+1
-0
No files found.
src/input/plugins/AlsaInputPlugin.cxx
View file @
20ae84bf
...
@@ -100,6 +100,7 @@ public:
...
@@ -100,6 +100,7 @@ public:
~
AlsaInputStream
()
{
~
AlsaInputStream
()
{
BlockingCall
(
MultiSocketMonitor
::
GetEventLoop
(),
[
this
](){
BlockingCall
(
MultiSocketMonitor
::
GetEventLoop
(),
[
this
](){
MultiSocketMonitor
::
Reset
();
MultiSocketMonitor
::
Reset
();
DeferredMonitor
::
Cancel
();
});
});
snd_pcm_close
(
capture_handle
);
snd_pcm_close
(
capture_handle
);
...
...
This diff is collapsed.
Click to expand it.
src/mixer/plugins/AlsaMixerPlugin.cxx
View file @
20ae84bf
...
@@ -57,6 +57,7 @@ public:
...
@@ -57,6 +57,7 @@ public:
~
AlsaMixerMonitor
()
{
~
AlsaMixerMonitor
()
{
BlockingCall
(
MultiSocketMonitor
::
GetEventLoop
(),
[
this
](){
BlockingCall
(
MultiSocketMonitor
::
GetEventLoop
(),
[
this
](){
MultiSocketMonitor
::
Reset
();
MultiSocketMonitor
::
Reset
();
DeferredMonitor
::
Cancel
();
});
});
}
}
...
...
This diff is collapsed.
Click to expand it.
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