Merge lp:~cjcurran/indicator-sound/handle-pulse-going-away-randomly into lp:indicator-sound/fourth

Proposed by Conor Curran
Status: Merged
Merged at revision: 277
Proposed branch: lp:~cjcurran/indicator-sound/handle-pulse-going-away-randomly
Merge into: lp:indicator-sound/fourth
Diff against target: 21 lines (+2/-2)
1 file modified
src/pulseaudio-mgr.c (+2/-2)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/handle-pulse-going-away-randomly
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+80464@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pulseaudio-mgr.c'
2--- src/pulseaudio-mgr.c 2011-10-10 11:18:23 +0000
3+++ src/pulseaudio-mgr.c 2011-10-26 15:21:24 +0000
4@@ -175,7 +175,7 @@
5 pm_update_volume (gint sink_index, pa_cvolume new_volume)
6 {
7 // LP: #850662
8- if (sink_index < 0){
9+ if (sink_index < 0 || pulse_context == NULL){
10 return;
11 }
12 pa_operation_unref (pa_context_set_sink_volume_by_index (pulse_context,
13@@ -197,7 +197,7 @@
14 pm_update_mic_gain (gint source_index, pa_cvolume new_gain)
15 {
16 // LP: #850662
17- if (source_index < 0){
18+ if (source_index < 0 || pulse_context == NULL){
19 return;
20 }
21 pa_operation_unref (pa_context_set_source_volume_by_index (pulse_context,

Subscribers

People subscribed via source and target branches