bugfixes

mrothenbuecher · Sep 26, 2018 · b7a60ae · b7a60ae
1 parent 3996225
commit b7a60ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/assets/js/watchdog.js b/assets/js/watchdog.js
@@ -250,9 +250,9 @@ if (contents) {
                   if(proc.File.includes("wineks")){
                     var clientreg = /[\\|\/]((?!\\|\/).)*?[\\|\/]wineks\.exe/;
                     client = (clientreg.exec(proc.File)[0] + "").replace("wineks.exe", "").replace(/[\\|\/]/g, "");
-                  }else if(proc.File.includes("abaserpgui")){
-                    var clientreg = /[\\|\/]((?!\\|\/).)*?[\\|\/]abaserpgui\.exe/;
-                    client = (clientreg.exec(proc.File)[0] + "").replace("abaserpgui.exe", "").replace(/[\\|\/]/g, "");
+                  }else if(proc.File.includes("abasgui")){
+                    var clientreg = /[\\|\/]((?!\\|\/).)*?[\\|\/]abasgui\.exe/;
+                    client = (clientreg.exec(proc.File)[0] + "").replace("abasgui.exe", "").replace(/[\\|\/]/g, "");
                   }
 
                   var row = "<tr>";
@@ -273,7 +273,6 @@ if (contents) {
 
                 if (lastClosed != 10000000000000000 && !ignoreAll) {
                   $('#closed-label').text($.i18n("last_closed") + msToTime(lastClosed));
-
                 } else {
                   $('#closed-label').text("");
                 }
@@ -299,6 +298,7 @@ if (contents) {
                   }
                   // Fehler ausgeben
                   console.log("errorInterval:", errorInterval);
+
                   if (settings.error_time_min > 0 && idleTime > settings.error_time_min && lastClosed > settings.close_time_min) {
                     makeError();
                   } else {
@@ -320,7 +320,7 @@ if (contents) {
                   }
                 } else {
                   $('#activity-label').text("");
-                  if(ignoreAll)
+                  if(ignoreAll || errorInterval != -1)
                     disableDialog();
 
                 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "abas-watchdog",
   "productName": "abas-watchdog",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "a License Watchdog for abas-ERP",
   "homepage": "https://github.com/mrothenbuecher/abas-watchdog",
   "main": "main.js",