[taler-taler-mdb] branch master updated: fixshutdown

[gnunet]

This is an automated email from the git hooks/post-receive script.

dominik-hofer pushed a commit to branch master
in repository taler-mdb.

The following commit(s) were added to refs/heads/master by this push:
     new d83c076  fixshutdown
d83c076 is described below

commit d83c076899a2cf775360a9c1a65769126087cc0e
Author: Dominik Hofer <address@hidden>
AuthorDate: Fri Dec 6 11:49:56 2019 +0100

    fixshutdown
---
 src/main.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main.c b/src/main.c
index dadc1f4..4f9c4bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1525,7 +1525,10 @@ write_mdb_command (void *cls)
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
                                 "write",
                                 uart_device_filename);
-      GNUNET_SCHEDULER_shutdown ();
+      if (in_shutdown)
+       mdb_shutdown ();
+      else
+       GNUNET_SCHEDULER_shutdown ();
       return;
     }
     mdb.tx_off += ret;
@@ -1890,13 +1893,14 @@ run_mdb_event_loop ()
   if ( (GNUNET_NO == mdb.session_running) &&
        (NULL == mdb.cmd) &&
        (NULL == mdb.last_cmd) )
-       {
-               GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-                                                               "Begining MDB 
session\n");
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+               "Begining MDB session\n");
     mdb.cmd = &beginSession;
-       }
+  }
   if ( (NULL == mdb.wtask) &&
        ( (NULL != mdb.cmd) ||
+        (in_shutdown) ||
          (mdb.tx_len > mdb.tx_off) ) )
   {
     if (disable_mdb)

-- 
To stop receiving notification emails like this one, please contact
address@hidden.