[Pcsclite-cvs-commit] r3046 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jul  4 09:44:09 2008
New Revision: 3046

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3046
Log:
SCardGetStatusChange(): simplify unknown reader case

Modified:
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=3046&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul  4 09:44:09 2008
@@ -1918,12 +1918,10 @@
 			 */
 			if (i == PCSCLITE_MAX_READERS_CONTEXTS)
 			{
-				if (currReader->dwCurrentState & SCARD_STATE_UNKNOWN)
-					currReader->dwEventState = SCARD_STATE_UNKNOWN;
-				else
+				currReader->dwEventState = SCARD_STATE_UNKNOWN;
+				if (!(currReader->dwCurrentState & SCARD_STATE_UNKNOWN))
 				{
-					currReader->dwEventState =
-						SCARD_STATE_UNKNOWN | SCARD_STATE_CHANGED;
+					currReader->dwEventState |= SCARD_STATE_CHANGED;
 					/*
 					 * Spec says use SCARD_STATE_IGNORE but a removed USB
 					 * reader with eventState fed into currentState will
@@ -1934,7 +1932,6 @@
 			}
 			else
 			{
-
 				/*
 				 * The reader has come back after being away
 				 */