From a8149abeec38035426ff0da1405e02021eec4ea7 Mon Sep 17 00:00:00 2001 From: Ondrej Mikle Date: Sat, 19 Jul 2014 15:22:03 +0200 Subject: [PATCH] Fixed open/close order in case of initiator error --- brmdoor_nfc.cpp | 4 ++-- runme.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/brmdoor_nfc.cpp b/brmdoor_nfc.cpp index fc8405b..94899d6 100644 --- a/brmdoor_nfc.cpp +++ b/brmdoor_nfc.cpp @@ -41,12 +41,12 @@ void NFCDevice::open() throw NFCError("Unable to open NFC device."); } + _opened = true; + if (nfc_initiator_init(_nfcDevice) < 0) { close(); throw NFCError("NFC initiator error"); } - - _opened = true; } void NFCDevice::close() diff --git a/runme.py b/runme.py index 22edd5f..78fde3d 100755 --- a/runme.py +++ b/runme.py @@ -7,3 +7,6 @@ nfc.close() nfc.open() print hexlify(nfc.scanUID()) print "Device is opened:", nfc.opened() +print "Closing device" +nfc.close() +print "Device is opened:", nfc.opened()