From 4650a529f7861bb1a379a59a3cee8cf2f28a4b1a Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Sat, 26 Sep 2015 16:13:46 +0200
Subject: [PATCH] Revert "src: handle last event before exiting status threads"

This reverts commit 3800c392918159fed582b2626591153725b29912.
---
 src/cardreader.cpp | 44 +++++++++++++++++++++-----------------------
 src/pcsclite.cpp   | 11 +++++------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/cardreader.cpp b/src/cardreader.cpp
index 4ab9e45..e858808 100644
--- a/src/cardreader.cpp
+++ b/src/cardreader.cpp
@@ -333,24 +333,6 @@ void CardReader::HandleReaderStatusChange(uv_async_t *handle, int status) {
 
     AsyncResult* ar = async_baton->async_result;
 
-    if ((ar->result == SCARD_S_SUCCESS) || (ar->result == (LONG)SCARD_E_NO_READERS_AVAILABLE)) {
-        const unsigned argc = 3;
-        Local<Value> argv[argc] = {
-            Nan::Undefined(), // argument
-            Nan::New<Number>(ar->status),
-            Nan::CopyBuffer(reinterpret_cast<char*>(ar->atr), ar->atrlen).ToLocalChecked()
-        };
-
-        Nan::Callback(Nan::New(async_baton->callback)).Call(argc, argv);
-    } else {
-        Local<Value> err = Nan::Error(error_msg("SCardGetStatusChange", ar->result).c_str());
-        // Prepare the parameters for the callback function.
-        const unsigned argc = 1;
-        Local<Value> argv[argc] = { err };
-        Nan::Callback(Nan::New(async_baton->callback)).Call(argc, argv);
-    }
-
-    // Do exit, after throwing last events
     if (ar->do_exit) {
         uv_close(reinterpret_cast<uv_handle_t*>(&async_baton->async), CloseCallback); // necessary otherwise UV will block
 
@@ -360,6 +342,23 @@ void CardReader::HandleReaderStatusChange(uv_async_t *handle, int status) {
         };
 
         Nan::MakeCallback(async_baton->reader->handle(), "emit", 1, argv);
+    } else {
+        if (ar->result == SCARD_S_SUCCESS) {
+            const unsigned argc = 3;
+            Local<Value> argv[argc] = {
+                Nan::Undefined(), // argument
+                Nan::New<Number>(ar->status),
+                Nan::CopyBuffer(reinterpret_cast<char*>(ar->atr), ar->atrlen).ToLocalChecked()
+            };
+
+            Nan::Callback(Nan::New(async_baton->callback)).Call(argc, argv);
+        } else {
+            Local<Value> err = Nan::Error(error_msg("SCardGetStatusChange", ar->result).c_str());
+            // Prepare the parameters for the callback function.
+            const unsigned argc = 1;
+            Local<Value> argv[argc] = { err };
+            Nan::Callback(Nan::New(async_baton->callback)).Call(argc, argv);
+        }
     }
 
     if (reader->m_status_thread) {
@@ -393,21 +392,20 @@ void CardReader::HandlerFunction(void* arg) {
 
         if (!keep_watching) {
             reader->m_state = 2;
-            async_baton->async_result->do_exit = true;
         }
 
+        uv_mutex_unlock(&reader->m_mutex);
+
         async_baton->async_result->result = result;
         async_baton->async_result->status = card_reader_state.dwEventState;
         memcpy(async_baton->async_result->atr, card_reader_state.rgbAtr, card_reader_state.cbAtr);
         async_baton->async_result->atrlen = card_reader_state.cbAtr;
-
-        uv_mutex_unlock(&reader->m_mutex);
-
         uv_async_send(&async_baton->async);
         card_reader_state.dwCurrentState = card_reader_state.dwEventState;
     }
 
-    // Exit flag set in keepwatching and handled in following uv_async_send  
+    async_baton->async_result->do_exit = true;
+    uv_async_send(&async_baton->async);
 }
 
 void CardReader::DoConnect(uv_work_t* req) {
diff --git a/src/pcsclite.cpp b/src/pcsclite.cpp
index bb91915..a53b850 100644
--- a/src/pcsclite.cpp
+++ b/src/pcsclite.cpp
@@ -124,6 +124,11 @@ void PCSCLite::HandleReaderStatusChange(uv_async_t *handle, int status) {
     AsyncBaton* async_baton = static_cast<AsyncBaton*>(handle->data);
     AsyncResult* ar = async_baton->async_result;
 
+    if (ar->do_exit) {
+        uv_close(reinterpret_cast<uv_handle_t*>(&async_baton->async), CloseCallback); // necessary otherwise UV will block
+        return;
+    }
+
     if ((ar->result == SCARD_S_SUCCESS) || (ar->result == (LONG)SCARD_E_NO_READERS_AVAILABLE)) {
         const unsigned argc = 2;
         Local<Value> argv[argc] = {
@@ -140,12 +145,6 @@ void PCSCLite::HandleReaderStatusChange(uv_async_t *handle, int status) {
         Nan::Callback(Nan::New(async_baton->callback)).Call(argc, argv);
     }
 
-    // Do exit, after throwing last events
-    if (ar->do_exit) {
-        uv_close(reinterpret_cast<uv_handle_t*>(&async_baton->async), CloseCallback); // necessary otherwise UV will block
-        return;
-    }
-
     /* reset AsyncResult */
     delete [] ar->readers_name;
     ar->readers_name = NULL;