Work in progress

willtobyte · Dec 27, 2024 · f1bba57 · f1bba57
1 parent 6a55e88
commit f1bba57
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -20,5 +20,5 @@ build: ## Build
 
 configure: clean ## Configure
 	conan remote update conancenter --url https://center2.conan.io
-	conan install . --output-folder=build --build=missing --profile=default --settings compiler.cppstd=20 --settings build_type=Release
-	cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DSDL2_DIR=generators -DCMAKE_BUILD_TYPE=Release -DLOCAL=OFF -DSANDBOX=ON -DENABLE_PROFILING=ON
+	conan install . --output-folder=build --build=missing --profile=webassembly --settings compiler.cppstd=20 --settings build_type=Release
+	cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DSDL2_DIR=generators -DCMAKE_BUILD_TYPE=Release -DLOCAL=ON -DSANDBOX=OFF -DENABLE_PROFILING=ON
diff --git a/src/timermanager.cpp b/src/timermanager.cpp
@@ -20,6 +20,8 @@ timermanager::~timermanager() noexcept {
   for (const auto &timer : _timers) {
     SDL_RemoveTimer(timer.first);
   }
+
+  _timers.clear();
 }
 
 void timermanager::set(int32_t interval, std::function<void()> fn) {
@@ -38,7 +40,7 @@ void timermanager::clear(int32_t id) noexcept {
 }
 
 void timermanager::add_timer(int32_t interval, std::function<void()> fn, bool repeat) {
-  const auto ptr = std::make_shared<std::function<void()>>(std::move(fn));
+  const auto ptr = std::make_shared<std::function<void()>>(fn);
   const auto id = SDL_AddTimer(interval, repeat ? wrapper : singleshot_wrapper, ptr.get());
   if (!id) [[unlikely]] {
     std::ostringstream oss;