Merge pull request #28 from rebuy-de/40682_fix_dispose

refs #40682 add null check on dispose
rebuy-de · Apr 27, 2015 · a09f402 · a09f402
2 parents bc0f04e + 750189f
commit a09f402
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Rb.Forms.Barcode.Droid/BarcodeScannerRenderer.cs b/Rb.Forms.Barcode.Droid/BarcodeScannerRenderer.cs
@@ -209,8 +209,8 @@ protected override void Dispose(bool disposing)
             this.Debug("Disposing");
 
             BarcodeScannerRenderer.KeepCamera = false;
-            configurator.Dispose();
-            previewFrameCallback.Dispose();
+            configurator?.Dispose();
+            previewFrameCallback?.Dispose();
             scannerService = null;
             barcodeDecoder = null;
 

diff --git a/Rb.Forms.Barcode.Droid/Camera/CameraConfigurator.cs b/Rb.Forms.Barcode.Droid/Camera/CameraConfigurator.cs
@@ -196,7 +196,7 @@ private bool isPickyDevice()
         private void clearBuffers()
         {
             foreach (var buffer in buffers) {
-                buffer.Dispose();
+                buffer?.Dispose();
             }
 
             buffers = new List<FastJavaByteArray>();

diff --git a/Rb.Forms.Barcode.Droid/View/PreviewFrameCallback.cs b/Rb.Forms.Barcode.Droid/View/PreviewFrameCallback.cs
@@ -25,7 +25,7 @@ public PreviewFrameCallback(BarcodeDecoder decoder, BarcodeScanner scanner)
         async public void OnPreviewFrame(IntPtr data, AndroidCamera camera)
         {
             if (buffer != null) {
-                buffer.Dispose();
+                buffer?.Dispose();
                 buffer = null;
             }
 
@@ -49,7 +49,7 @@ async public void OnPreviewFrame(IntPtr data, AndroidCamera camera)
 
         public void Dispose()
         {
-            buffer.Dispose();
+            buffer?.Dispose();
             base.Dispose();
         }