Enhance KillThread checks for thread validity

brichards64 · web-flow · commit 9de8592676d7 · 2025-12-16T15:48:00.000Z
diff --git a/src/DataModelBase/Utilities.cpp b/src/DataModelBase/Utilities.cpp
@@ -62,7 +62,7 @@ bool Utilities::KillThread(Thread_args* &args){
   
   bool ret=false;
   
-  if(args){
+  if(args && args->thread){
     
     args->running=false;
     args->kill=true;
@@ -78,7 +78,7 @@ bool Utilities::KillThread(Thread_args* &args){
 }
 
 bool Utilities::KillThread(std::string ThreadName){
-  
+  if(Threads.count(ThreadName) == 0 ) return false;
   return KillThread(Threads[ThreadName]);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ bool Utilities::KillThread(Thread_args* &args){`
`62`	`62`
`63`	`63`	`bool ret=false;`
`64`	`64`
`65`		`- if(args){`
	`65`	`+ if(args && args->thread){`
`66`	`66`
`67`	`67`	`args->running=false;`
`68`	`68`	`args->kill=true;`
`@@ -78,7 +78,7 @@ bool Utilities::KillThread(Thread_args* &args){`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`bool Utilities::KillThread(std::string ThreadName){`
`81`		`-`
	`81`	`+ if(Threads.count(ThreadName) == 0 ) return false;`
`82`	`82`	`return KillThread(Threads[ThreadName]);`
`83`	`83`
`84`	`84`	`}`