Merge branch 'master' of https://github.com/irov/Mengine

irov · Aug 29, 2023 · 87fc4cc · 87fc4cc
2 parents 8067721 + a1a9bfe
commit 87fc4cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/src/Environment/Apple/ConstStringHolderNSString.mm b/src/Environment/Apple/ConstStringHolderNSString.mm
@@ -13,27 +13,13 @@
     //////////////////////////////////////////////////////////////////////////
     ConstStringHolderNSString::~ConstStringHolderNSString()
     {
-        if( m_value != nil )
-		{
-			[m_value release];
-			m_value = nil;
-		}
+        m_value = nil;
     }
     //////////////////////////////////////////////////////////////////////////
     void ConstStringHolderNSString::setNSString( const NSString * _value )
     {
-        if( m_value != nil )
-		{
-			[m_value release];
-			m_value = nil;
-		}
-
-        m_value = _value;
-
-        if( m_value != nil )
+        if( _value != nil )
         {
-            [m_value retain];
-
             const char * data = [m_value UTF8String];
             size_t size = MENGINE_STRLEN( data );
             int64_t hash = Helper::makeHash( data, size );
@@ -44,6 +30,8 @@
         {
             this->setup( "", 0, 0 );
         }
+
+        m_value = _value;
     }
     //////////////////////////////////////////////////////////////////////////
 }
diff --git a/src/Plugins/AppleGameCenterPlugin/AppleGameCenterService.mm b/src/Plugins/AppleGameCenterPlugin/AppleGameCenterService.mm
@@ -34,11 +34,7 @@
     {
         m_provider = nullptr;
 
-        if( m_gameCenterDelegate != nil )
-        {
-            [m_gameCenterDelegate release];
-            m_gameCenterDelegate = nil;
-        }
+        m_gameCenterDelegate = nil;
     }
 //////////////////////////////////////////////////////////////////////////
     void AppleGameCenterService::setProvider( const AppleGameCenterProviderInterfacePtr & _provider )

diff --git a/src/Plugins/AppleMARSDKPlugin/AppleMARSDKService.mm b/src/Plugins/AppleMARSDKPlugin/AppleMARSDKService.mm
@@ -48,17 +48,8 @@
     {
         [[MARSDK sharedInstance] setDelegate:nil];
 
-        if( m_delegate != nil )
-        {
-            [m_delegate release];
-            m_delegate = nil;
-        }
-
-        if( m_adRewardedDelegate != nil )
-        {
-            [m_adRewardedDelegate release];
-            m_adRewardedDelegate = nil;
-        }
+        m_delegate = nil;
+        m_adRewardedDelegate = nil;
     }
     //////////////////////////////////////////////////////////////////////
     void AppleMARSDKService::setProvider( const AppleMARSDKProviderInterfacePtr & _provider )