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;
     }