Update Dockerfile

.devcontainer/Dockerfile

@@ -1,2 +1,2 @@
-FROM kerberos/devcontainer:9da0ee3
+FROM kerberos/devcontainer:b2bc659
 LABEL AUTHOR=Kerberos.io

machinery/src/components/Kerberos.go

@@ -240,13 +240,6 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 		// the agent will cleanup and restart.
 		status = <-communication.HandleBootstrap
 
-		close(communication.HandleONVIF)
-		communication.HandleONVIF = nil
-		close(communication.HandleLiveHDHandshake)
-		communication.HandleLiveHDHandshake = nil
-		close(communication.HandleMotion)
-		communication.HandleMotion = nil
-
 		// Here we are cleaning up everything!
 		if configuration.Config.Offline != "true" {
 			communication.HandleHeartBeat <- "stop"
@@ -270,6 +263,12 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 			subQueue = nil
 			communication.SubQueue = nil
 		}
+		close(communication.HandleONVIF)
+		communication.HandleONVIF = nil
+		close(communication.HandleLiveHDHandshake)
+		communication.HandleLiveHDHandshake = nil
+		close(communication.HandleMotion)
+		communication.HandleMotion = nil
 
 		// Disconnect MQTT
 		routers.DisconnectMQTT(mqttClient, &configuration.Config)

machinery/src/routers/websocket/main.go

@@ -136,7 +136,7 @@ func ForwardSDStream(ctx context.Context, clientID string, connection *Connectio
 logreader:
 	for {
 		var encodedImage string
-		if cursor != nil && decoder != nil {
+		if queue != nil && cursor != nil && decoder != nil {
 			pkt, err := cursor.ReadPacket()
 			if err == nil {
 				if !pkt.IsKeyFrame {