From b26a59b574296f01215d528ad72bb513963c306d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 11 Sep 2024 10:14:51 -0400 Subject: [PATCH] Fix calling libcec_close twice on drop --- CHANGELOG.md | 2 ++ src/lib.rs | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcd9885..1ab9c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Fix calling `libcec_close` twice on drop + ## 7.1.1 - Require libcec >= 4.0.3 for fixed windows compatibility diff --git a/src/lib.rs b/src/lib.rs index 3fb0db6..9c4d0ee 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,13 +28,13 @@ use libcec_sys::{ cec_command, cec_datapacket, cec_device_type_list, cec_keypress, cec_log_message, cec_logical_address, cec_logical_addresses, cec_power_status, libcec_audio_get_status, libcec_audio_mute, libcec_audio_toggle_mute, libcec_audio_unmute, libcec_clear_configuration, - libcec_close, libcec_configuration, libcec_connection_t, libcec_destroy, - libcec_get_active_source, libcec_get_device_power_status, libcec_get_logical_addresses, - libcec_initialise, libcec_is_active_source, libcec_mute_audio, libcec_open, - libcec_power_on_devices, libcec_send_key_release, libcec_send_keypress, - libcec_set_active_source, libcec_set_inactive_view, libcec_set_logical_address, - libcec_standby_devices, libcec_switch_monitoring, libcec_transmit, libcec_volume_down, - libcec_volume_up, ICECCallbacks, LIBCEC_OSD_NAME_SIZE, LIBCEC_VERSION_CURRENT, + libcec_configuration, libcec_connection_t, libcec_destroy, libcec_get_active_source, + libcec_get_device_power_status, libcec_get_logical_addresses, libcec_initialise, + libcec_is_active_source, libcec_mute_audio, libcec_open, libcec_power_on_devices, + libcec_send_key_release, libcec_send_keypress, libcec_set_active_source, + libcec_set_inactive_view, libcec_set_logical_address, libcec_standby_devices, + libcec_switch_monitoring, libcec_transmit, libcec_volume_down, libcec_volume_up, ICECCallbacks, + LIBCEC_OSD_NAME_SIZE, LIBCEC_VERSION_CURRENT, }; use num_traits::ToPrimitive; @@ -1347,7 +1347,6 @@ impl CecConnectionCfg { impl Drop for CecConnection { fn drop(&mut self) { unsafe { - libcec_close(self.1); libcec_destroy(self.1); } }