Commit fd05341a87abd402bef43b8665e0b9256bd86c30

Con Kolivas 2012-02-13T10:39:26

Do not loop indefinitely setting poclbm kernel to load a binary.

diff --git a/ocl.c b/ocl.c
index e273064..e801ceb 100644
--- a/ocl.c
+++ b/ocl.c
@@ -485,7 +485,8 @@ build:
 	/* If no binary is available, and we have a card that suffers with phatk
 	 * on SDK2.6, use the poclbm kernel instead if one has not been
 	 * selected. */
-	if (chosen_kernel == KL_NONE && !strstr(name, "Tahiti") && clState->hasBitAlign &&
+	if (clState->chosen_kernel != KL_POCLBM && chosen_kernel == KL_NONE &&
+		!strstr(name, "Tahiti") && clState->hasBitAlign &&
 		(strstr(vbuff, "844.4") /* Linux 64 bit ATI 2.6 SDK */	||
 		 strstr(vbuff, "851.4") /* Windows 64 bit "" */		||
 		 strstr(vbuff, "831.4") /* Windows & Linux 32 bit "" */ )) {
@@ -505,6 +506,7 @@ build:
 			sprintf(numbuf, "%d", (int)sizeof(long));
 			strcat(binaryfilename, numbuf);
 			strcat(binaryfilename, ".bin");
+
 			goto loadbin;
 	}