diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-10-26 16:58:15 -0400 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-10-26 16:58:15 -0400 |
| commit | 0c3cc3e840b87733e73119fd8887c30466126151 (patch) | |
| tree | 4ced70df605d7f36d83647c6387768159335b6a2 /src | |
| parent | 2d85ce77dba8f72869788093a8197c151ea899ce (diff) | |
| parent | bfc485869ee1c8d27f194f5fe0b053d1550b03b5 (diff) | |
| download | ayatana-indicator-sound-0c3cc3e840b87733e73119fd8887c30466126151.tar.gz ayatana-indicator-sound-0c3cc3e840b87733e73119fd8887c30466126151.tar.bz2 ayatana-indicator-sound-0c3cc3e840b87733e73119fd8887c30466126151.zip | |
merge fix to protect against a null pa context
Diffstat (limited to 'src')
| -rw-r--r-- | src/pulseaudio-mgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulseaudio-mgr.c b/src/pulseaudio-mgr.c index 1da8ce1..ad6d34f 100644 --- a/src/pulseaudio-mgr.c +++ b/src/pulseaudio-mgr.c @@ -175,7 +175,7 @@ void pm_update_volume (gint sink_index, pa_cvolume new_volume) { // LP: #850662 - if (sink_index < 0){ + if (sink_index < 0 || pulse_context == NULL){ return; } pa_operation_unref (pa_context_set_sink_volume_by_index (pulse_context, @@ -197,7 +197,7 @@ void pm_update_mic_gain (gint source_index, pa_cvolume new_gain) { // LP: #850662 - if (source_index < 0){ + if (source_index < 0 || pulse_context == NULL){ return; } pa_operation_unref (pa_context_set_source_volume_by_index (pulse_context, |