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/GranitProtocolDecoder.java b/src/org/traccar/protocol/GranitProtocolDecoder.java
index 0c7ea4d1d..3a2d24fa2 100644
--- a/src/org/traccar/protocol/GranitProtocolDecoder.java
+++ b/src/org/traccar/protocol/GranitProtocolDecoder.java
@@ -71,7 +71,9 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
     private static void decodeStructure(ChannelBuffer buf, Position position) {
         short flags = buf.readUnsignedByte();
         position.setValid(BitUtil.check(flags, 7));
-        position.set(Position.KEY_ALARM, BitUtil.check(flags, 1));
+        if (BitUtil.check(flags, 1)) {
+            position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+        }
 
         short satDel = buf.readUnsignedByte();
         position.set(Position.KEY_SATELLITES, BitUtil.from(satDel, 4));