From 2b6e20e68850dcd72dd35e88e791a88edcb7f9ae Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Fri, 18 Mar 2022 12:03:58 +0100 Subject: [PATCH] Fix SvxLink crash introduced in recent commit --- src/async/audio/AsyncAudioDeviceAlsa.cpp | 2 +- src/async/core/AsyncTimer.cpp | 2 +- src/versions | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp index d104ac88..9035a97a 100644 --- a/src/async/audio/AsyncAudioDeviceAlsa.cpp +++ b/src/async/audio/AsyncAudioDeviceAlsa.cpp @@ -116,7 +116,7 @@ class AudioDeviceAlsa::AlsaWatch : public sigc::trackable ~AlsaWatch() { - activity.clear(); + //activity.clear(); std::list::const_iterator cii; for(cii = watch_list.begin(); cii != watch_list.end(); ++cii) { diff --git a/src/async/core/AsyncTimer.cpp b/src/async/core/AsyncTimer.cpp index 6781e29e..2810a599 100644 --- a/src/async/core/AsyncTimer.cpp +++ b/src/async/core/AsyncTimer.cpp @@ -127,7 +127,7 @@ Timer::Timer(int timeout_ms, Type type, bool enabled) Timer::~Timer(void) { - expired.clear(); + //expired.clear(); setEnable(false); } /* Timer::~Timer */ diff --git a/src/versions b/src/versions index 5126d825..393b4686 100644 --- a/src/versions +++ b/src/versions @@ -11,7 +11,7 @@ LIBECHOLIB=1.3.3.99.0 LIBASYNC=1.6.99.17 # SvxLink versions -SVXLINK=1.7.99.60 +SVXLINK=1.7.99.61 MODULE_HELP=1.0.0 MODULE_PARROT=1.1.1 MODULE_ECHO_LINK=1.5.99.2