diff options
| author | Damian Minkov <damencho@jitsi.org> | 2012-11-30 07:23:47 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2012-11-30 07:23:47 +0000 |
| commit | aba1f10bd9f14495279df7d61018f66d5441534a (patch) | |
| tree | 654c6d188b25d8f66a2a963fc4b0610914f5e4cb /src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java | |
| parent | f5d8e03d62044948d2ffa95e328caef6c9eec2fb (diff) | |
| download | jitsi-aba1f10bd9f14495279df7d61018f66d5441534a.zip jitsi-aba1f10bd9f14495279df7d61018f66d5441534a.tar.gz jitsi-aba1f10bd9f14495279df7d61018f66d5441534a.tar.bz2 | |
Fixes video configuration tab when no video device is available. Moves some logging from info to trace and swing code in event dispatch thread.
Diffstat (limited to 'src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java index f29cdcb..d521310 100644 --- a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java +++ b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java @@ -323,10 +323,20 @@ public class DeviceConfigurationComboBoxModel {
for (CaptureDevice device : getDevices())
{
- if (device.info.equals(info))
+ if (info.equals(device.info))
return device;
}
}
+ else
+ {
+ // just find the one with no info, the None device
+ for (CaptureDevice device : getDevices())
+ {
+ if (device.info == null)
+ return device;
+ }
+ }
+
return null;
}
|