fix merge with master

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index e31b8ae73e0aaf6c63c880080772f24847388581..24c13e2487d1d9b5944dcaf62cd01b82077be8c2 100644 (file)
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -177,6 +177,9 @@ bool DetectionEngine::offloaded(Packet* p)
 
 void DetectionEngine::idle()
 {
+    if ( !offload_ids )
+        return;
+
     while ( !offload_ids->empty() )
     {
         const struct timespec blip = { 0, 1 };
@@ -343,6 +346,8 @@ void DetectionEngine::inspect(Packet* p)
 
     log_events(p);
     reset();
+
+    Stream::check_flow_block_pending(p);
 }
 
 // Return 0 if no OTN since -1 return indicates queue limit reached.