Allow FSM window name to change on start transition

Author: rrivera747

otsdaq/GatewaySupervisor/GatewaySupervisor.cc

@@ -4886,7 +4886,8 @@ try
 			   << ") "
 			      "to control progress, please transition to "
 			   << RunControlStateMachine::HALTED_STATE_NAME << " using the active "
-			   << "State Machine '" << activeStateMachineWindowName_ << ".'" << __E__;
+			   << "State Machine '" << activeStateMachineWindowName_ << "' (UID: " << activeStateMachineName_
+			       << ")." << __E__;
 			__SS_THROW__;
 		}
 		else  // clear active state machine
@@ -5294,6 +5295,12 @@ try
 		parameters.addParameter(
 		    "RunNumber",
 		    runNumber);  // will be cached in activeStateMachineRunNumber_ in transitionStarting()
+		
+		if(activeStateMachineWindowName_ != fsmWindowName)
+		{
+			__SUP_COUT__ << "Running fsm window name '" << fsmWindowName << "' is now the active state machine window." << __E__;
+			activeStateMachineWindowName_ = fsmWindowName;
+		}
 	}                    //end Start transition
 	else if(!(command == RunControlStateMachine::HALT_TRANSITION_NAME ||
 	          command == RunControlStateMachine::SHUTDOWN_TRANSITION_NAME ||

otsdaq/GatewaySupervisor/GatewaySupervisor.h

@@ -238,13 +238,13 @@ class WorkLoopManager;
 			//===================
 			BroadcastThreadStruct(BroadcastThreadStruct &&b)
 				: threadIndex_(b.threadIndex_)
-				, exitThread_(b.exitThread_)
-				, working_(b.working_)
-				, workToDo_(b.workToDo_)
-				, error_(b.error_)
-				, hardCancelRequested_(b.hardCancelRequested_)
+				, exitThread_(b.exitThread_.load())
+				, working_(b.working_.load())
+				, workToDo_(b.workToDo_.load())
+				, error_(b.error_.load())
+				, hardCancelRequested_(b.hardCancelRequested_.load())
 				, pthreadId_(b.pthreadId_)
-				, hasPthreadId_(b.hasPthreadId_)
+				, hasPthreadId_(b.hasPthreadId_.load())
 			{
 			}  // end BroadcastThreadStruct move constructor()