X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecSharp%2FCecSharpTypes.h;h=e88166746116a63e47d46609757dd828479ffaee;hb=006b76b92c05b0f387575962b2851f2ba4a4b569;hp=64172bb4c5cb83ae2f845108bf0c9bcaa5964130;hpb=a9fb46b4e785365d573b7f06f18d32576efbdbe6;p=deb_libcec.git

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 64172bb..e881667 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -641,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;
@@ -677,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)