Fix a bug 01/231201/1 accepted/tizen_5.5_unified accepted/tizen_5.5_unified_wearable_hotfix tizen_5.5 tizen_5.5_wearable_hotfix accepted/tizen/5.5/unified/20200422.123317 accepted/tizen/5.5/unified/wearable/hotfix/20201027.113506 submit/tizen_5.5/20200420.054356 submit/tizen_5.5/20200421.010722 submit/tizen_5.5/20200421.102623 submit/tizen_5.5_wearable_hotfix/20201026.184304
authorBoram Bae <boram21.bae@samsung.com>
Mon, 20 Apr 2020 05:24:58 +0000 (14:24 +0900)
committerBoram Bae <boram21.bae@samsung.com>
Mon, 20 Apr 2020 05:24:58 +0000 (14:24 +0900)
Change-Id: Id9390743fb1ebc0a6951f071d50e1cd8e05112d4
Signed-off-by: Boram Bae <boram21.bae@samsung.com>
src/shared/channel.cpp
src/shared/event_handler.h

index 020d5fb..22b0eaa 100644 (file)
@@ -39,6 +39,13 @@ public:
        , m_msg(msg)
        { }
 
+       virtual ~send_event_handler()
+       {
+               if (m_ch) {
+                       m_ch->remove_pending_event_id(m_event_id);
+               }
+       }
+
        bool handle(int fd, event_condition condition)
        {
                if (!m_ch) {
index dbe8c7d..e75b822 100644 (file)
@@ -35,13 +35,13 @@ public:
        virtual ~event_handler() {}
 
        virtual bool handle(int fd, event_condition condition) = 0;
-       void set_event_id(int64_t event_id)
+       void set_event_id(uint64_t event_id)
        {
-               m_event_id = 0;
+               m_event_id = event_id;
        }
 
 protected:
-       int64_t m_event_id;
+       uint64_t m_event_id;
 };
 
 }