Vutils

vic4key · Oct 28, 2023 · 157d7db · 157d7db
1 parent 69efdf7
commit 157d7db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/include/Vutils.h b/include/Vutils.h
@@ -3612,6 +3612,8 @@ class Debouncer : public SingletonT<Debouncer>
     Timer() : m_handle(0), m_function(nullptr) {}
   };
 
+  virtual ~Debouncer();
+
   void debounce(ulongptr id, ulong elapse, std::function<void()> fn);
   bool exists(ulongptr id);
   void remove(ulongptr id);

diff --git a/include/template/singleton.tpl b/include/template/singleton.tpl
@@ -26,8 +26,10 @@ public:
     }
   }
 
-  // SingletonT(SingletonT&) = delete;
-  // void operator=(const SingletonT&) = delete;
+  SingletonT(SingletonT&&) = delete;
+  SingletonT(SingletonT const&) = delete;
+  SingletonT& operator=(SingletonT&&) = delete;
+  SingletonT& operator=(SingletonT const&) = delete;
 
   static T& instance()
   {

diff --git a/src/details/debouncer.cpp b/src/details/debouncer.cpp
@@ -12,6 +12,11 @@ namespace vu
 ulongptr Debouncer::m_using_timer_id;
 std::unordered_map<ulongptr, Debouncer::Timer*> Debouncer::m_timers;
 
+Debouncer::~Debouncer()
+{
+  this->cleanup();
+}
+
 bool Debouncer::exists(ulongptr id)
 {
   auto it = m_timers.find(id);