bugfix: avoid segfaults

stop() was not reentrant, and we should not call it from different threads

1 files changed, 7 insertions, 0 deletions

diff --git a/src/AntFr310XT.cpp b/src/AntFr310XT.cpp
index 89b2b5a..7178225 100644
--- a/src/AntFr310XT.cpp
+++ b/src/AntFr310XT.cpp
@@ -185,6 +185,7 @@ AntFr310XT2::start()
 void AntFr310XT2::stop()
 {
   m_eventThKill = 1;
+  //m_eventTh.join();
   m_antMessenger->kill();
   if(m_serial->isOpen())
   {
@@ -194,9 +195,15 @@ void AntFr310XT2::stop()
     m_antMessenger->ANT_ResetSystem();
   }
   m_serial->close();
+  changeState(ST_ANTFS_START0);
+}
+
+void AntFr310XT2::stopAsync()
+{
   changeState(ST_ANTFS_LAST);
 }
 
+
 const int
 AntFr310XT2::getSMState() const
 {