Add NULL check to wokring set change due to working set disappearance

Open-Agriculture · Jan 7, 2025 · cc02258 · cc02258
1 parent 3f07b08
commit cc02258
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/ServerMainComponent.cpp b/src/ServerMainComponent.cpp
@@ -545,8 +545,16 @@ void ServerMainComponent::timerCallback()
 					if (nextWorkingSet->get_control_function()->get_address() != activeWorkingSetMasterAddress)
 					{
 						activeWorkingSetMasterAddress = nextWorkingSet->get_control_function()->get_address();
-						activeWorkingSetDataMaskObjectID = std::static_pointer_cast<isobus::WorkingSet>(nextWorkingSet->get_working_set_object())->get_active_mask();
-						newWorkingSetFound = true;
+						if (nextWorkingSet->get_working_set_object())
+						{
+							activeWorkingSetDataMaskObjectID = std::static_pointer_cast<isobus::WorkingSet>(nextWorkingSet->get_working_set_object())->get_active_mask();
+							newWorkingSetFound = true;
+						}
+						else
+						{
+							activeWorkingSetDataMaskObjectID = isobus::NULL_OBJECT_ID;
+							newWorkingSetFound = false;
+						}
 						break;
 					}
 				}