From acaedd866ba3184eba7c60f87196e28847116bd8 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 20 Dec 2017 13:34:50 -0600
Subject: [PATCH] Fix PR feedback.

---
 src/Avalonia.Base/Utilities/Ref.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/Ref.cs b/src/Avalonia.Base/Utilities/Ref.cs
index f78544b416..98077cd4fd 100644
--- a/src/Avalonia.Base/Utilities/Ref.cs
+++ b/src/Avalonia.Base/Utilities/Ref.cs
@@ -57,13 +57,14 @@ namespace Avalonia.Utilities
                 var old = _refs;
                 while (true)
                 {
+                    if (old == 0)
+                    {
+                        throw new ObjectDisposedException("Cannot add a reference to a nonreferenced item");
+                    }
                     var current = Interlocked.CompareExchange(ref _refs, old + 1, old);
                     if (current == old)
                     {
-                        if (current == 0)
-                        {
-                            throw new ObjectDisposedException("Cannot add a reference to a 0-referenced item");
-                        }
+                        break;
                     }
                     old = current;
                 }
@@ -78,12 +79,12 @@ namespace Avalonia.Utilities
 
                     if (current == old)
                     {
-                        if (current == 1)
+                        if (old == 1)
                         {
                             _item.Dispose();
                             _item = null;
                         }
-                        return;
+                        break;
                     }
                     old = current;
                 }
@@ -100,6 +101,7 @@ namespace Avalonia.Utilities
             {
                 _item = item;
                 _counter = counter;
+                Interlocked.MemoryBarrier();
                 _counter.AddRef();
             }
 
@@ -148,9 +150,7 @@ namespace Avalonia.Utilities
                 {
                     if (_item != null)
                     {
-                        TResult castItem = null;
-                        Volatile.Write(ref castItem, (TResult)(object)_item);
-                        return new Ref<TResult>(castItem, _counter);
+                        return new Ref<TResult>((TResult)(object)_item, _counter);
                     }
                     throw new ObjectDisposedException("Ref<" + typeof(T) + ">");
                 }