X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=zlint%2Fzlint.cpp;h=a0ad235a65680f7bf93433284a8d7dfdffe720e9;hp=0c596e3022619ce1b0d8b8dc3cfe7e06101f27b9;hb=6b50fe651b6f6e83f4bfa9c4f00a793a40ed423c;hpb=10c10dc81402e616b22c536f5b06d9471330c608

diff --git a/zlint/zlint.cpp b/zlint/zlint.cpp
index 0c596e3..a0ad235 100644
--- a/zlint/zlint.cpp
+++ b/zlint/zlint.cpp
@@ -79,13 +79,12 @@ void Zlint::timeoutNotify()
     {
         if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
         {
-            close();
             client(m_host);
             timeout(30);
             return;
         }
+        close_goto_next();
     }
-    close_goto_next();
 }
 
 void Zlint::failNotify()
@@ -94,13 +93,12 @@ void Zlint::failNotify()
     {
         if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
         {
-            close();
             client(m_host);
             timeout(30);
             return;
         }
+        close_goto_next();
     }
-    close_goto_next();
 }
 
 void Zlint::connectNotify()
@@ -109,8 +107,8 @@ void Zlint::connectNotify()
     {
         if (m_cur_test->m_t->init(this) != TEST_FINISHED)
             return;
+        close_goto_next();
     }
-    close_goto_next();
 }
 
 void Zlint::recv_GDU(Z_GDU *gdu, int len)
@@ -122,23 +120,25 @@ void Zlint::recv_GDU(Z_GDU *gdu, int len)
             return;
         if (r == TEST_REOPEN)
         {
-            close();
             client(m_host);
             timeout(30);
             return;
         }
+        close_goto_next();
     }
-    close_goto_next();
 }
 
 void Zlint::close_goto_next()
 {
-    close();
     if (m_cur_test)
         m_cur_test = m_cur_test->m_next;
     if (m_cur_test)
+    {
         client(m_host);
-    timeout(30);
+        timeout(30);
+    }
+    else
+        close();
 }
 
 IPDU_Observer *Zlint::sessionNotify(