diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2011-11-29 12:19:49 +0000 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2011-11-29 12:19:49 +0000 |
| commit | 233b28f5aab5a804ab2774c2fae1c79aef0346e2 (patch) | |
| tree | 6acd34d28950820299168031b78f45ae443e2ee4 /src/net/java/sip | |
| parent | 48f149cace2cbe74a7443bad66e3b9cb180e29a4 (diff) | |
| download | jitsi-233b28f5aab5a804ab2774c2fae1c79aef0346e2.zip jitsi-233b28f5aab5a804ab2774c2fae1c79aef0346e2.tar.gz jitsi-233b28f5aab5a804ab2774c2fae1c79aef0346e2.tar.bz2 | |
Check if TelephonyOpSet is found before adding a call listener
Diffstat (limited to 'src/net/java/sip')
| -rw-r--r-- | src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutActivator.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutActivator.java b/src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutActivator.java index 998e7ab..89aa015 100644 --- a/src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutActivator.java +++ b/src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutActivator.java @@ -207,7 +207,8 @@ public class GlobalShortcutActivator OperationSetBasicTelephony<?> opSet = service.getOperationSet(OperationSetBasicTelephony.class); - opSet.addCallListener(globalShortcutService.getCallShortcut()); + if(opSet != null) + opSet.addCallListener(globalShortcutService.getCallShortcut()); } } @@ -222,7 +223,8 @@ public class GlobalShortcutActivator { OperationSetBasicTelephony<?> opSet = provider.getOperationSet(OperationSetBasicTelephony.class); - opSet.addCallListener(globalShortcutService.getCallShortcut()); + if(opSet != null) + opSet.addCallListener(globalShortcutService.getCallShortcut()); } /** @@ -236,6 +238,7 @@ public class GlobalShortcutActivator { OperationSetBasicTelephony<?> opSet = provider.getOperationSet(OperationSetBasicTelephony.class); - opSet.removeCallListener(globalShortcutService.getCallShortcut()); + if(opSet != null) + opSet.removeCallListener(globalShortcutService.getCallShortcut()); } } |