From 73288eb24b328c874dd1973d5e81aa3158890f37 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 22 Oct 2008 05:31:53 +0000
Subject: [PATCH] Merge fixes from trunk.

---
 src/nvcore/Ptr.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/nvcore/Ptr.h b/src/nvcore/Ptr.h
index f260aa4..1d8d9c9 100644
--- a/src/nvcore/Ptr.h
+++ b/src/nvcore/Ptr.h
@@ -43,8 +43,11 @@ public:
 
 	/** Delete owned pointer and assign new one. */
 	void operator=( T * p ) {
-		delete m_ptr;
-		m_ptr = p;
+		if (p != m_ptr)
+		{
+			delete m_ptr;
+			m_ptr = p;
+		}
 	}
 
 	/** Member access. */
@@ -249,14 +252,14 @@ public:
 		/** -> operator. */
 		BaseClass * operator -> () const
 		{
-			piCheck( m_ptr != NULL );
+			nvCheck( m_ptr != NULL );
 			return m_ptr;
 		}
 
 		/** * operator. */
 		BaseClass & operator*() const
 		{
-			piCheck( m_ptr != NULL );
+			nvCheck( m_ptr != NULL );
 			return *m_ptr;
 		}