SEBWIN-287 Updated seb2 browser with further fix for lockscreen being…

… displayed again after unlocking it with the quit password.

SebWindowsBrowser/xul_seb/modules/SebHost.jsm

@@ -69,7 +69,7 @@ this.SebHost = {
 	msgHandler : {},
 	sendHandler : {},
 	reconnectTry : 0,
-	//reconnectTriesReached : false,
+	reconnectTriesReached : false,
 	reconnectInterval : 0,
 	reconnectMaxTries : 0,
 	reconnectIntervalObj : null,
@@ -138,14 +138,14 @@ this.SebHost = {
 			sl.debug("messageSocket close: " + e);
 			messageSocket = null;
 			base.messageServer = false;
-			if (!seb.isLocked && su.getConfig("lockOnMessageSocketClose","boolean",false)) {
+			if (!seb.isLocked && su.getConfig("lockOnMessageSocketClose","boolean",true) && !base.reconnectTriesReached) {
 				seb.lock();
 			} 
 		} 
 
 		messageSocket.onmessage = function(evt) { 
 			// ToDo: message handling !!
-			sl.debug("socket message type: " + evt.type);
+			// sl.debug("socket message type: " + evt.type);
 			if (/^SEB\./.test(evt.data)) { // old string messages
 				switch (evt.data) {
 					case "SEB.close" :
@@ -250,6 +250,10 @@ this.SebHost = {
 	},
 
 	reconnectSocket : function() {
+        if (base.reconnectTriesReached) {
+            base.resetReconnecting();
+            return;
+        }
 		sl.debug("reconnectSocket...");
 		if (base.messageServer) {
 			sl.debug("message socket reconnected!");
@@ -260,6 +264,7 @@ this.SebHost = {
 		base.reconnectTry += 1;
 		if (base.reconnectTry > base.reconnectMaxTries) {
 			sl.debug("reconnectMaxTries reached");
+            base.reconnectTriesReached = true;
 			base.resetReconnecting();
 			seb.setUnlockScreen();
 			return;

SebWindowsBrowser/xul_seb/modules/seb.jsm

@@ -779,13 +779,15 @@ this.seb =  {
 				imageBox.classList.remove("hidden2");
 			}
 		}
-        ss.sendUnlock();
 		base.isLocked = false;
         if (!fromSocket) {
             if (sh.messageServer) {
                 base.deleteUnconnectedMessage();
             }
         }
+        else {
+            ss.sendUnlock();
+        }
 	},
 
 	quit: function(e) {