Merge pull request PowerShellMafia#150 from breenmachine/dev

HarmJ0y · web-flow · commit 0f2bd1d7f360 · 2016-06-12T16:17:17.000-04:00
Fixed thread countdown timer in Invoke-ThreadedFunction, wasn't ever …
diff --git a/Recon/PowerView.ps1 b/Recon/PowerView.ps1
@@ -9263,7 +9263,7 @@ function Invoke-ThreadedFunction {
         $WaitTimeout = Get-Date
 
         # set a 60 second timeout for the scanning threads
-        while ($($Jobs | Where-Object {$_.IsCompleted -eq $False}).count -gt 0 -or $($($(Get-Date) - $WaitTimeout).totalSeconds) -gt 60) {
+        while ($($Jobs | Where-Object {$_.IsCompleted -eq $False}).count -gt 0 -and $($($(Get-Date) - $WaitTimeout).totalSeconds) -lt 60) {
                 Start-Sleep -MilliSeconds 500
             }
 

Original file line number	Diff line number	Diff line change
`@@ -9263,7 +9263,7 @@ function Invoke-ThreadedFunction {`
`9263`	`9263`	`$WaitTimeout = Get-Date`
`9264`	`9264`
`9265`	`9265`	`# set a 60 second timeout for the scanning threads`
`9266`		`- while ($($Jobs \| Where-Object {$_.IsCompleted -eq $False}).count -gt 0 -or $($($(Get-Date) - $WaitTimeout).totalSeconds) -gt 60) {`
	`9266`	`+ while ($($Jobs \| Where-Object {$_.IsCompleted -eq $False}).count -gt 0 -and $($($(Get-Date) - $WaitTimeout).totalSeconds) -lt 60) {`
`9267`	`9267`	`Start-Sleep -MilliSeconds 500`
`9268`	`9268`	`}`
`9269`	`9269`