1.1 --- a/Server/Events/EventHidConsumerControl.cs	Wed Aug 17 16:39:36 2016 +0200
     1.2 +++ b/Server/Events/EventHidConsumerControl.cs	Thu Aug 18 14:35:50 2016 +0200
     1.3 @@ -42,10 +42,14 @@
     1.4          /// <returns></returns>
     1.5          public override bool Equals(object obj)
     1.6          {
     1.7 -            EventHidConsumerControl e = (EventHidConsumerControl) obj;
     1.8 -            bool res = (e != null && e.Usage == Usage);
     1.9 -            return res;
    1.10 +            if (obj is EventHidConsumerControl)
    1.11 +            {
    1.12 +                EventHidConsumerControl e = (EventHidConsumerControl)obj;
    1.13 +                bool res = (e.Usage == Usage);
    1.14 +                return res;
    1.15 +            }
    1.16 +
    1.17 +            return false;
    1.18          }
    1.19 -
    1.20      }
    1.21  }