diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4f88368..2b6adfd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,5 @@ -v1.0.315: Updated drivelist backend dependency +v1.0.316: More work on issue #241 - up for testing +v1.0.315: Updated drivelist backend dependency, updated Build process to use correct Windows/VS image v1.0.314: Updated SSL Certificates, #240 Increased modal data availability for custom macros, Fixed dialog window close bug #228, Fixed alarm dialog bug #241, Fixed Z-index bug #229 v1.0.313: Added scrollbars to Macro Editor to cater for smaller screens v1.0.312: Updated SSL Certificates diff --git a/app/js/websocket.js b/app/js/websocket.js index f28dc1d..5814eec 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -383,7 +383,7 @@ function initSocket() { ] }); - if (data.indexOf("ALARM: 9") == -1) { + if (data.indexOf("ALARM: 6") == -1 && data.indexOf("ALARM: 7") == -1 && data.indexOf("ALARM: 8") == -1 && data.indexOf("ALARM: 9") == -1 && data.indexOf("ALARM: 10") == -1) { openDialogs.push(dialog); } diff --git a/package.json b/package.json index beb6f7f..99e36fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.315", + "version": "1.0.316", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Interface Software", "author": "github.com/openbuilds ",