From 9f0b612c4ab08e08542bad36d158d366ea78556d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 24 Sep 2010 07:12:55 +0000
Subject: [PATCH] hangs on mac, try to end transaction after cancel; refs #8

---
 src/pcsc.hxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pcsc.hxx b/src/pcsc.hxx
index f20409a..589ed08 100644
--- a/src/pcsc.hxx
+++ b/src/pcsc.hxx
@@ -362,12 +362,11 @@ namespace pcsc {
           /*! @note Micro$oft QinSCard does not know cancel, therefore
               on Windoze cancel is replaced by commit. */
           void cancelTransaction() {
-#ifdef WIN32
-            check(SCardEndTransaction(_id, SCARD_LEAVE_CARD),
-                  "smartcard end transaction");
-#else
+#ifndef WIN32
             check(SCardCancelTransaction(_id), "smartcard cancel transaction");
 #endif
+            check(SCardEndTransaction(_id, SCARD_LEAVE_CARD),
+                  "smartcard end transaction");
           }
 
           /*! @throw not_implemented if _protocol is unknown. */