dotnet · krwq · Jul 2, 2026 · Jul 1, 2026 · Jul 1, 2026
diff --git a/src/devices/Ads1115/Ads1115.cs b/src/devices/Ads1115/Ads1115.cs
@@ -641,8 +641,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null;
             }
+
+            _gpioController = null;
         }
     }
 }
diff --git a/src/devices/Ak8963/Ak8963.cs b/src/devices/Ak8963/Ak8963.cs
@@ -345,8 +345,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
     }
 }
diff --git a/src/devices/Blinkt/Blinkt.cs b/src/devices/Blinkt/Blinkt.cs
@@ -73,8 +73,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null!;
             }
+
+            _gpioController = null!;
         }
 
         /// <summary>

diff --git a/src/devices/Bmm150/Bmm150.cs b/src/devices/Bmm150/Bmm150.cs
@@ -266,8 +266,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
     }
 }
diff --git a/src/devices/Bno055/Bno055Sensor.cs b/src/devices/Bno055/Bno055Sensor.cs
@@ -563,8 +563,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
 
         private void WriteReg(Registers reg, byte param) => _i2cDevice.Write(new byte[] { (byte)reg, param });

diff --git a/src/devices/Button/GpioButton.cs b/src/devices/Button/GpioButton.cs
@@ -152,12 +152,13 @@ protected override void Dispose(bool disposing)
                 if (_shouldDispose)
                 {
                     _gpioController?.Dispose();
-                    _gpioController = null!;
                 }
                 else
                 {
                     _gpioController.ClosePin(_buttonPin);
                 }
+
+                _gpioController = null!;
             }
 
             base.Dispose(disposing);

diff --git a/src/devices/Ccs811/Ccs811Sensor.cs b/src/devices/Ccs811/Ccs811Sensor.cs
@@ -460,7 +460,6 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
             else if (_controller is object)
             {
@@ -479,6 +478,8 @@ public void Dispose()
                     _controller.ClosePin(_pinWake);
                 }
             }
+
+            _controller = null;
         }
 
         #region I2C operations

diff --git a/src/devices/CharacterLcd/LcdInterface.Gpio.cs b/src/devices/CharacterLcd/LcdInterface.Gpio.cs
@@ -252,9 +252,10 @@ protected override void Dispose(bool disposing)
                 if (_shouldDispose)
                 {
                     _controller?.Dispose();
-                    _controller = null!;
                 }
 
+                _controller = null!;
+
                 base.Dispose(disposing);
             }
         }

diff --git a/src/devices/Charlieplex/CharlieplexSegment.cs b/src/devices/Charlieplex/CharlieplexSegment.cs
@@ -214,8 +214,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null!;
             }
+
+            _gpioController = null!;
         }
 
         // IOutputSegment Implementation

diff --git a/src/devices/Common/Iot/Device/Multiplexing/GpioOutputSegment.cs b/src/devices/Common/Iot/Device/Multiplexing/GpioOutputSegment.cs
@@ -130,8 +130,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/DCMotor/DCMotor.cs b/src/devices/DCMotor/DCMotor.cs
@@ -266,8 +266,9 @@ public virtual void Dispose()
             if (_shouldDispose)
             {
                 Controller?.Dispose();
-                Controller = null!;
             }
+
+            Controller = null!;
         }
     }
 }
diff --git a/src/devices/Dhtxx/DhtBase.cs b/src/devices/Dhtxx/DhtBase.cs
@@ -385,13 +385,13 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
             else if (_controller?.IsPinOpen(_pin) ?? false)
             {
                 _controller.ClosePin(_pin);
             }
 
+            _controller = null;
             _i2cDevice?.Dispose();
             _i2cDevice = null;
         }

diff --git a/src/devices/ExplorerHat/ExplorerHat.cs b/src/devices/ExplorerHat/ExplorerHat.cs
@@ -47,8 +47,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/ExplorerHat/Led.cs b/src/devices/ExplorerHat/Led.cs
@@ -75,8 +75,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/ExplorerHat/Lights.cs b/src/devices/ExplorerHat/Lights.cs
@@ -114,8 +114,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
 
         /// <summary>

diff --git a/src/devices/ExplorerHat/Motors.cs b/src/devices/ExplorerHat/Motors.cs
@@ -91,8 +91,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/GrovePi/GrovePi.cs b/src/devices/GrovePi/GrovePi.cs
@@ -54,8 +54,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
 
         /// <summary>

diff --git a/src/devices/Hcsr04/Hcsr04.cs b/src/devices/Hcsr04/Hcsr04.cs
@@ -159,8 +159,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/Hcsr501/Hcsr501.cs b/src/devices/Hcsr501/Hcsr501.cs
@@ -48,8 +48,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
 
         /// <summary>

diff --git a/src/devices/Ht1632/Ht1632.cs b/src/devices/Ht1632/Ht1632.cs
@@ -135,8 +135,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
+
+            _controller = null;
         }
 
         private void SetupPins()

diff --git a/src/devices/KeyMatrix/KeyMatrix.cs b/src/devices/KeyMatrix/KeyMatrix.cs
@@ -216,7 +216,6 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null;
             }
             else
             {
@@ -225,6 +224,8 @@ public void Dispose()
                     ClosePins();
                 }
             }
+
+            _gpioController = null;
         }
 
         private void OpenPins()

diff --git a/src/devices/LidarLiteV3/LidarLiteV3.cs b/src/devices/LidarLiteV3/LidarLiteV3.cs
@@ -354,9 +354,10 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null;
             }
 
+            _gpioController = null;
+
             _i2cDevice?.Dispose();
             _i2cDevice = null!;
         }

diff --git a/src/devices/LiquidLevel/LiquidLevelSwitch.cs b/src/devices/LiquidLevel/LiquidLevelSwitch.cs
@@ -50,8 +50,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
+
+            _controller = null!;
         }
     }
 }
diff --git a/src/devices/Mcp23xxx/Mcp23xxx.cs b/src/devices/Mcp23xxx/Mcp23xxx.cs
@@ -253,13 +253,14 @@ protected override void Dispose(bool disposing)
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
 
                 _pinValues.Clear();
                 _bus?.Dispose();
-                _bus = null!;
             }
 
+            _controller = null;
+            _bus = null!;
+
             base.Dispose(disposing);
         }
 

diff --git a/src/devices/Mcp25xxx/Mcp25xxx.cs b/src/devices/Mcp25xxx/Mcp25xxx.cs
@@ -676,9 +676,10 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpioController?.Dispose();
-                _gpioController = null;
             }
 
+            _gpioController = null;
+
             _spiDevice?.Dispose();
             _spiDevice = null!;
         }

diff --git a/src/devices/Mfrc522/Mfrc522.cs b/src/devices/Mfrc522/Mfrc522.cs
@@ -865,8 +865,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
+
+            _controller = null;
         }
 
         /// <inheritdoc/>

diff --git a/src/devices/Mhz19b/Mhz19b.cs b/src/devices/Mhz19b/Mhz19b.cs
@@ -206,9 +206,10 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _serialPortStream?.Dispose();
-                _serialPortStream = null!;
             }
 
+            _serialPortStream = null!;
+
             if (_serialPort?.IsOpen ?? false)
             {
                 _serialPort.Close();

diff --git a/src/devices/Mpu6xxx9xxx/Mpu9250.cs b/src/devices/Mpu6xxx9xxx/Mpu9250.cs
@@ -277,8 +277,9 @@ public Mpu9250(I2cDevice i2cDevice, bool shouldDispose = true, I2cDevice? i2CDev
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
 
     }

diff --git a/src/devices/Nrf24l01/Nrf24l01.cs b/src/devices/Nrf24l01/Nrf24l01.cs
@@ -229,8 +229,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _gpio?.Dispose();
-                _gpio = null!;
             }
+
+            _gpio = null!;
         }
 
         /// <summary>

diff --git a/src/devices/Pca95x4/Pca95x4.cs b/src/devices/Pca95x4/Pca95x4.cs
@@ -171,8 +171,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
+
+            _controller = null;
         }
     }
 }
diff --git a/src/devices/Pcd8544/Pcd8544.cs b/src/devices/Pcd8544/Pcd8544.cs
@@ -778,7 +778,6 @@ protected override void Dispose(bool disposing)
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null!;
             }
             else
             {
@@ -801,6 +800,7 @@ protected override void Dispose(bool disposing)
                 }
             }
 
+            _controller = null!;
             _spiDevice?.Dispose();
             _spiDevice = null!;
             _pwmBacklight?.Dispose();

diff --git a/src/devices/PiJuice/PiJuice.cs b/src/devices/PiJuice/PiJuice.cs
@@ -49,8 +49,9 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _i2cDevice?.Dispose();
-                _i2cDevice = null!;
             }
+
+            _i2cDevice = null!;
         }
 
         /// <summary>

diff --git a/src/devices/ShiftRegister/ShiftRegister.cs b/src/devices/ShiftRegister/ShiftRegister.cs
@@ -208,9 +208,10 @@ public void Dispose()
             if (_shouldDispose)
             {
                 _controller?.Dispose();
-                _controller = null;
             }
 
+            _controller = null;
+
             // SPI devices are always disposed
             _spiDevice?.Dispose();
             _spiDevice = null;