Merge pull request #7 from jean-edouard/ahem

OXT-439: fix the broken logic
OpenXT · Nov 24, 2015 · 692e5b7 · 692e5b7
2 parents 54b9a9b + dc0beb3
commit 692e5b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/rpc.c b/src/rpc.c
@@ -251,7 +251,7 @@ gboolean ctxusb_daemon_get_device_info(CtxusbDaemonObject *this,
     char *uuid = policy_get_sticky_uuid(IN_dev_id);
     if (uuid != NULL) {
       /* But it has an always-assign VM */
-      if (device->type | OPTICAL)
+      if (device->type & OPTICAL)
         /* It's a CD drive */
         *OUT_state = DEV_STATE_CD_ALWAYS;
       else {
@@ -266,7 +266,7 @@ gboolean ctxusb_daemon_get_device_info(CtxusbDaemonObject *this,
       *OUT_vm_assigned = g_strdup(uuid);
     } else {
       /* It doesn't have an always-assign VM, it's all free */
-      if (device->type | OPTICAL)
+      if (device->type & OPTICAL)
         /* Unless it's a CD drive */
         *OUT_state = DEV_STATE_CD_DOM0;
       else

diff --git a/src/usbmanager.c b/src/usbmanager.c
@@ -39,7 +39,7 @@
  */
 void usbmanager_device_added(device_t *device)
 {
-  if (device->type | OPTICAL)
+  if (device->type & OPTICAL)
     notify_com_citrix_xenclient_usbdaemon_optical_device_detected(g_xcbus,
                                                                   USBDAEMON,
                                                                   USBDAEMON_OBJ);