Release 1.4.6.

NEWS

@@ -1,6 +1,10 @@
 NEWS
 ****
 
+New in 1.4.6:
+
+  * Fix issue 74: Assertion failed on fsw_destroy_session.
+
 New in 1.4.5.3:
 
   * Fix issue 67: 100% CPU usage while using libfswatch.  This issue only

configure.ac

@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 #
-# Copyright (C) 2014, Enrico M. Crisostomo
+# Copyright (C) 2014, 2015, Enrico M. Crisostomo
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-dnl Copyright (C) 2014, Enrico M. Crisostomo
+dnl Copyright (C) 2014, 2015, Enrico M. Crisostomo
 AC_PREREQ([2.69])
 m4_include([m4/fswatch_version.m4])
 AC_INIT([fswatch], FSWATCH_VERSION, [[email protected]], [], [https://github.com/emcrisostomo/fswatch])

libfswatch/NEWS

@@ -1,6 +1,10 @@
 NEWS
 ****
 
+New in 1.4.6:
+
+  * Fix issue 74: Assertion failed on fsw_destroy_session.
+
 New in 1.4.0:
 
   * Move monitors to separate library.

libfswatch/m4/libfswatch_version.m4

@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Enrico M. Crisostomo
+# Copyright (C) 2014, 2015, Enrico M. Crisostomo
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,6 +12,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-m4_define([LIBFSWATCH_VERSION], [1.4.5.3])
+m4_define([LIBFSWATCH_VERSION], [1.4.6])
 m4_define([LIBFSWATCH_API_VERSION], [1:0:1])
 m4_define([LIBFSWATCH_REVISION], [1])

libfswatch/src/libfswatch/c/libfswatch.cpp

@@ -424,7 +424,7 @@ int fsw_start_monitor(const FSW_HANDLE handle)
 
     session->monitor->set_filters(session->filters);
     session->monitor->set_follow_symlinks(session->follow_symlinks);
-    session->monitor->set_latency(session->latency);
+    if (session->latency) session->monitor->set_latency(session->latency);
     session->monitor->set_recursive(session->recursive);
 
 #ifdef HAVE_CXX_MUTEX
@@ -444,6 +444,8 @@ int fsw_start_monitor(const FSW_HANDLE handle)
 
 int fsw_destroy_session(const FSW_HANDLE handle)
 {
+  int ret = FSW_OK;
+
   try
   {
 #ifdef HAVE_CXX_MUTEX
@@ -470,20 +472,20 @@ int fsw_destroy_session(const FSW_HANDLE handle)
         session->monitor->set_context(nullptr);
         delete static_cast<fsw_callback_context *> (context);
       }
-
       delete session->monitor;
     }
 
     sessions.erase(handle);
-#ifdef HAVE_CXX_MUTEX
-    session_mutexes.erase(handle);
-#endif
   }
   catch (int error)
   {
-    return fsw_set_last_error(error);
+    ret = error;
   }
 
+  #ifdef HAVE_CXX_MUTEX
+    session_mutexes.erase(handle);
+  #endif
+
   return fsw_set_last_error(FSW_OK);
 }
 

m4/fswatch_version.m4

@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Enrico M. Crisostomo
+# Copyright (C) 2014, 2015, Enrico M. Crisostomo
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,5 +12,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-m4_define([FSWATCH_VERSION], [1.4.5.3])
+m4_define([FSWATCH_VERSION], [1.4.6])
 m4_define([FSWATCH_REVISION], [1])

src/fswatch.cpp

@@ -123,7 +123,7 @@ static void list_monitor_types(ostream& stream)
 static void print_version(ostream& stream)
 {
   stream << PACKAGE_STRING << "\n";
-  stream << "Copyright (C) 2014, Enrico M. Crisostomo <[email protected]>.\n";
+  stream << "Copyright (C) 2014, 2015, Enrico M. Crisostomo <[email protected]>.\n";
   stream << _("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n");
   stream << _("This is free software: you are free to change and redistribute it.\n");
   stream << _("There is NO WARRANTY, to the extent permitted by law.\n");