[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] branch master updated: fix nfc payment
From: |
gnunet |
Subject: |
[taler-taler-mdb] branch master updated: fix nfc payment |
Date: |
Fri, 06 Dec 2019 11:04:08 +0100 |
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 f636f27 fix nfc payment
f636f27 is described below
commit f636f2723d45333d1a442fd72141d03ccfd379e4
Author: Dominik Hofer <address@hidden>
AuthorDate: Fri Dec 6 10:54:03 2019 +0100
fix nfc payment
---
src/main.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main.c b/src/main.c
index c963fbe..dadc1f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -260,6 +260,11 @@ struct PaymentActivity
*/
struct GNUNET_SCHEDULER_Task *delay_task;
+ /**
+ * Payment checking delayed task
+ */
+ struct GNUNET_SCHEDULER_Task *delay_pay_task;
+
/**
* What is the price the user is paying?
*/
@@ -689,6 +694,8 @@ cleanup_payment (struct PaymentActivity *pa)
GNUNET_SCHEDULER_cancel (pa->task);
if (NULL != pa->delay_task)
GNUNET_SCHEDULER_cancel (pa->delay_task);
+ if (NULL != pa->delay_pay_task)
+ GNUNET_SCHEDULER_cancel (pa->delay_pay_task);
if (NULL != pa->taler_pay_uri)
{
#if HAVE_QRENCODE_H
@@ -1112,11 +1119,11 @@ check_payment_cb (void *cls,
QR code in the future and in that case the payment may happen
anytime even before the NFC communication succeeds. */
if ( (NULL == pa->cpo) &&
- (NULL == pa->delay_task) )
+ (NULL == pa->delay_pay_task) )
{
- pa->delay_task = GNUNET_SCHEDULER_add_delayed (MAX_HTTP_RETRY_FREQ,
- &check_payment_again,
- pa);
+ pa->delay_pay_task = GNUNET_SCHEDULER_add_delayed (MAX_HTTP_RETRY_FREQ,
+ &check_payment_again,
+ pa);
}
}
if (NULL == pa->taler_pay_uri)
@@ -1145,7 +1152,7 @@ check_payment_again (void *cls)
{
struct PaymentActivity *pa = cls;
- pa->delay_task = NULL;
+ pa->delay_pay_task = NULL;
GNUNET_assert (NULL == pa->cpo);
pa->cpo = TALER_MERCHANT_check_payment (ctx,
backendBaseUrl,
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-mdb] branch master updated: fix nfc payment,
gnunet <=