[taler-taler-mdb] branch master updated (12124f9 -> c902e09)

[gnunet]

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

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

    from 12124f9  Merge branch 'master' of git+ssh://git.taler.net/taler-mdb
     new 61c69c5  fix
     new c902e09  fix

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main.c b/src/main.c
index 0a69ebc..140b30b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,12 +51,14 @@ along with
 #include <gnunet/gnunet_json_lib.h>
 #include <taler/taler_json_lib.h>
 #include <taler/taler_merchant_service.h>
-#if HAVE_QRENCODE_H             /* for adafruit pitft display */
+#if HAVE_QRENCODE_H
+#include <qrencode.h>
+#endif
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+/* for adafruit pitft display */
 #include <linux/fb.h>
-#endif
 
 /* Constants */
 #define MAX_SIZE_RX_BUFFER 256
@@ -1873,7 +1875,6 @@ run_mdb_event_loop ()
 {
   struct GNUNET_DISK_FileHandle fh = { mdb.uartfd };
 
-  return;
   if ( (GNUNET_NO == mdb.session_running) &&
        (NULL == mdb.cmd) &&
        (NULL == mdb.last_cmd) )
@@ -2000,6 +2001,8 @@ mdb_init ()
 
   if (disable_mdb)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+               "Running with MDB disabled!\n");
     run_mdb_event_loop ();
     return GNUNET_OK;
   }

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