X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=e88166746116a63e47d46609757dd828479ffaee;hb=5d5e105deb964d38568f046d1d1f0a4a656e1a99;hp=2c158a5d64dbdb7b78c919c58c55a28cf37e4419;hpb=d93fd39688099e9ff782896ce6cfa2520daa593a;p=deb_libcec.git

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 2c158a5..e881667 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -369,6 +369,7 @@ namespace CecSharp
 			return Addresses[(unsigned int)iAddress] != CecLogicalAddress::Unregistered;
 		}
 
+		property CecLogicalAddress          Primary;
 		property array<CecLogicalAddress> ^ Addresses;
 	};
 
@@ -640,11 +641,14 @@ namespace CecSharp
 
 		void DestroyDelegates()
 		{
-			m_bHasCallbacks = false;
-			delete m_callbacks;
-			m_logMessageGCHandle.Free();
-			m_keypressGCHandle.Free();
-			m_commandGCHandle.Free();
+			if (m_bHasCallbacks)
+			{
+				m_bHasCallbacks = false;
+				delete m_callbacks;
+				m_logMessageGCHandle.Free();
+				m_keypressGCHandle.Free();
+				m_commandGCHandle.Free();
+			}
 		}
 
 		CecLogMessageManagedDelegate ^                    m_logMessageDelegate;
@@ -676,11 +680,11 @@ namespace CecSharp
 			ClientVersion       = CecClientVersion::VersionPre1_5;
 
 			GetSettingsFromROM  = false;
-			UseTVMenuLanguage   = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE ? true : false;
-			PowerOnStartup      = CEC_DEFAULT_SETTING_POWER_ON_STARTUP ? true : false;
-			PowerOffShutdown    = CEC_DEFAULT_SETTING_POWER_OFF_SHUTDOWN ? true : false;
-			PowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER ? true : false;
-			PowerOffOnStandby   = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY ? true : false;
+			UseTVMenuLanguage   = CEC_DEFAULT_SETTING_USE_TV_MENU_LANGUAGE == 1;
+			PowerOnStartup      = CEC_DEFAULT_SETTING_POWER_ON_STARTUP == 1;
+			PowerOffShutdown    = CEC_DEFAULT_SETTING_POWER_OFF_SHUTDOWN == 1;
+			PowerOffScreensaver = CEC_DEFAULT_SETTING_POWER_OFF_SCREENSAVER == 1;
+			PowerOffOnStandby   = CEC_DEFAULT_SETTING_POWER_OFF_ON_STANDBY == 1;
 		}
 
 		void SetCallbacks(CecCallbackMethods ^callbacks)