[Pcsclite-cvs-commit] r5392 - /trunk/PCSC/src/readerfactory.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Nov  9 14:17:04 2010
New Revision: 5392

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5392
Log:
RFRemoveReader(): destroy the event handler only if it exists already

Modified:
    trunk/PCSC/src/readerfactory.c

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=5392&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Tue Nov  9 14:17:04 2010
@@ -465,9 +465,9 @@
 	while (SCARD_S_SUCCESS ==
 		RFReaderInfoNamePort(port, readerName, &sContext))
 	{
-
 		/* Try to destroy the thread */
-		rv = EHDestroyEventHandler(sContext);
+		if (sContext -> pthThread)
+			(void)EHDestroyEventHandler(sContext);
 
 		rv = RFUnInitializeReader(sContext);
 		if (rv != SCARD_S_SUCCESS)