If g_isCanceled is true, the thread has already been canceled.

merge-requests/1/head
Jan Hauffa 2011-04-17 15:27:14 +02:00 zatwierdzone przez m. allan noah
rodzic a75bd3e8f7
commit 9e2aabc976
1 zmienionych plików z 0 dodań i 2 usunięć

Wyświetl plik

@ -851,7 +851,6 @@ MustScanner_GetLine (SANE_Byte * lpLine, unsigned short * wLinesCount,
DBG (DBG_FUNC, "MustScanner_GetLine: call in\n");
g_isCanceled = SANE_FALSE;
g_isScanning = SANE_TRUE;
wWantedTotalLines = *wLinesCount;
@ -888,7 +887,6 @@ MustScanner_GetLine (SANE_Byte * lpLine, unsigned short * wLinesCount,
if (g_isCanceled)
{
pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetLine: thread exit\n");
break;