Merge remote-tracking branch 'origin/develop' into EmmanueleVersion

WebDoorCreator.CamSrv/ProcMan.vb

@@ -239,7 +239,8 @@ Public Class ProcMan
          ' se qualche processo in stop, lo faccio ripartire
          For ThreadIndex = 0 To ThreadList.Count - 1
             Dim Thread = ThreadList(ThreadIndex)
-                If Thread.ThreadState = ThreadState.Stopped Then
+            If Thread.ThreadState = ThreadState.Stopped AndAlso Thread.ThreadState = ThreadState.Aborted AndAlso
+               Thread.ThreadState = ThreadState.Suspended Then
                Thread.Abort()
                Dim ThreadId As Integer = ThreadIndex
                Thread = New Thread(Sub()
@@ -760,11 +761,10 @@ Public Class ProcMan
       Integer.TryParse(txtNumThread.Text, numReq)
       ' controllo se cambiato il num thread
       If numReq <> m_MaxCamInstances Then
-            If m_bStopProcess = False Then
          stopAllThreads()
-            End If
+         Thread.Sleep(100)
-            ' imposto
          SetMaxCamInstances(numReq)
+         'startAllThreads()
       End If
    End Sub
 
@@ -916,9 +916,15 @@ Public Class ProcMan
    Private Sub CheckStartAutoRestart()
       TimerCheck.Enabled = chkAutoRestart.Checked
       If chkAutoRestart.Checked Then
-            TimerCheck.Start()
+         If m_ExecutionThread.ThreadState = ThreadState.Aborted OrElse m_ExecutionThread.ThreadState = ThreadState.Stopped OrElse
-            Task.Delay(500)
+            m_ExecutionThread.ThreadState = ThreadState.Suspended Then
+            stopAllThreads()
+            Thread.Sleep(200)
+            m_ExecutionThread.Abort()
+            Thread.Sleep(200)
             startAllThreads()
+         End If
+         TimerCheck.Start()
       Else
          TimerCheck.Stop()
       End If