Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac	(revision 423)
+++ trunk/configure.ac	(revision 424)
@@ -12,5 +12,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.0.9)
+AM_INIT_AUTOMAKE(samhain, 3.0.10)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 423)
+++ trunk/docs/Changelog	(revision 424)
@@ -1,2 +1,6 @@
+3.0.10:
+	* Revert to previous logic in samhain.c because it will block
+	  otherwise (reported by Alexandr Sabitov)
+
 3.0.9:
 	* Fixed a Cygwin compile warning
Index: trunk/src/samhain.c
===================================================================
--- trunk/src/samhain.c	(revision 423)
+++ trunk/src/samhain.c	(revision 424)
@@ -1988,4 +1988,5 @@
        */
       if      (sh.flag.checkSum == SH_CHECK_INIT ||
+	       (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 ||
 	       (sh.flag.checkSum == SH_CHECK_CHECK &&
 		(sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE)))
@@ -1996,5 +1997,4 @@
 	}
       else if (sh.flag.checkSum == SH_CHECK_CHECK || 
-	       (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 ||
 	       (sh.flag.update == S_TRUE && 
 		(sh.flag.isdaemon == S_TRUE || sh.flag.loop == S_TRUE)))