Handle enum value in message queue and use if instead of switch to prevent compiler warnings

Handle enum value in message queue and use if instead of switch to prevent compiler warnings #1442