Changes from V4.1.2:

	+ BUG FIX:  Removed the call to prvIsQueueEmpty from within xQueueCRReceive
	  as it exited with interrupts enabled.  Thanks Paul Katz.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@52 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/queue.c b/Source/queue.c
index 488c8069a9bd1f02333f6329e4d50b489e21689f..8239180c229cf62c0513e5f72a0286b1b8cb0b85 100644 (file)
--- a/Source/queue.c
+++ b/Source/queue.c
@@ -60,6 +60,10 @@ Changes from V4.0.5
          functions exiting when a block time remains and the function has\r
          not completed.\r
 \r
+Changes from V4.1.2:\r
+\r
+       + BUG FIX:  Removed the call to prvIsQueueEmpty from within xQueueCRReceive\r
+         as it exited with interrupts enabled.  Thanks Paul Katz.\r
 */\r
 \r
 #include <stdlib.h>\r
@@ -746,7 +750,7 @@ signed portBASE_TYPE xReturn;
        between the check to see if the queue is empty and blocking on the queue. */\r
        portDISABLE_INTERRUPTS();\r
        {\r
-               if( prvIsQueueEmpty( pxQueue ) )\r
+               if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0 )\r
                {\r
                        /* There are no messages in the queue, do we want to block or just\r
                        leave with nothing? */                  \r