Merge remote-tracking branch 'refs/remotes/tananaev/master'

# Conflicts:
#	web/app/view/LoginController.js

1 files changed, 3 insertions, 1 deletions

diff --git a/src/org/traccar/protocol/BlackKiteProtocolDecoder.java b/src/org/traccar/protocol/BlackKiteProtocolDecoder.java
index 92179072a..c2c051884 100644
--- a/src/org/traccar/protocol/BlackKiteProtocolDecoder.java
+++ b/src/org/traccar/protocol/BlackKiteProtocolDecoder.java
@@ -122,7 +122,9 @@ public class BlackKiteProtocolDecoder extends BaseProtocolDecoder {
                 case TAG_STATUS:
                     int status = buf.readUnsignedShort();
                     position.set(Position.KEY_IGNITION, BitUtil.check(status, 9));
-                    position.set(Position.KEY_ALARM, BitUtil.check(status, 15));
+                    if (BitUtil.check(status, 15)) {
+                        position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+                    }
                     position.set(Position.KEY_POWER, BitUtil.check(status, 2));
                     break;