Refactored swap-and-delete operations

1 files changed, 3 insertions, 9 deletions

diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp
index dd39bbcb..cf2ab21a 100644
--- a/src/FilamentMonitors/FilamentMonitor.cpp
+++ b/src/FilamentMonitors/FilamentMonitor.cpp
@@ -139,9 +139,7 @@ bool FilamentMonitor::IsValid() const noexcept
 		if (sensor != nullptr)
 		{
 			sensor->Disable();
-			sensor = nullptr;
-			std::swap(sensor, filamentSensors[extruder]);
-			delete sensor;
+			DeleteObject(filamentSensors[extruder]);
 			reprap.SensorsUpdated();
 		}
 
@@ -350,9 +348,7 @@ bool FilamentMonitor::IsValid() const noexcept
 
 	for (FilamentMonitor *&f : filamentSensors)
 	{
-		FilamentMonitor *temp;
-		std::swap(temp, f);
-		delete temp;
+		DeleteObject(f);
 	}
 }
 
@@ -387,9 +383,7 @@ bool FilamentMonitor::IsValid() const noexcept
 		{
 			reply.lcatf("Filament monitor for extruder %u has been deleted due to configuration change", extruder);
 			warn = true;
-			FilamentMonitor *f = nullptr;
-			std::swap(f, filamentSensors[extruder]);
-			delete f;
+			DeleteObject(filamentSensors[extruder]);
 		}
 	}
 	return warn;