From d482dcaefc08b2e34713b47481d7d6ffacfbd211 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Mon, 30 May 2011 16:31:59 +0000 Subject: [PATCH] Fixes disabled mute and sound buttons in a conference call. Fixes NullPointerException causing problems with sound indicators in a conference call. --- .../java/sip/communicator/impl/gui/main/call/CallPanel.java | 4 ++++ .../impl/neomedia/device/AudioMixerMediaDevice.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java index ff21ada6b..d63df98df 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java @@ -360,6 +360,8 @@ public void stateChanged(ChangeEvent e) } else { + // These buttons are only added in the conference call. For the one + // to one call mute and sound buttons are in the call peer panel. localLevel.setEnabled(false); remoteLevel.setEnabled(false); @@ -650,6 +652,8 @@ public void enableButtons() conferenceButton.setEnabled(true); holdButton.setEnabled(true); recordButton.setEnabled(true); + localLevel.setEnabled(true); + remoteLevel.setEnabled(true); if (!isLastConference) { diff --git a/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java b/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java index c42b61ece..8e616a2fe 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java @@ -486,6 +486,10 @@ public AudioMixerMediaDeviceSession() */ public void addLocalUserAudioLevelListener(SimpleAudioLevelListener l) { + // If the listener is null, we have nothing more to do here. + if (l == null) + return; + synchronized(localUserAudioLevelListenersSyncRoot) { //if this is the first listener that we are seeing then we also