Merge pull request #1286 from fireice-uk/dev

Bug fix release 2.4.1
fireice-uk · Apr 3, 2018 · 737383a · 737383a
2 parents 6feffe2 + 5ce9892
commit 737383a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/xmrstak/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
@@ -926,7 +926,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
 		return(ERR_OCL_API);
 	}
 
-	if(miner_algo == cryptonight_heavy)
+	/* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+	 * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+	 */
+	if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
 	{
 		// version
 		if ((ret = clSetKernelArg(ctx->Kernels[0], 4, sizeof(cl_uint), &version)) != CL_SUCCESS)
@@ -975,7 +978,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
 			return ERR_OCL_API;
 		}
 	}
-	else if(miner_algo == cryptonight_heavy)
+	/* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+	 * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+	 */
+	else if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
 	{
 		// version
 		if ((ret = clSetKernelArg(ctx->Kernels[1], 3, sizeof(cl_uint), &version)) != CL_SUCCESS)
@@ -1035,7 +1041,10 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
 		return(ERR_OCL_API);
 	}
 
-	if(miner_algo == cryptonight_heavy)
+    /* ATTENTION: if we miner cryptonight_heavy the kernel needs an additional parameter version.
+	 * Do NOT use the variable `miner_algo` because this variable is changed dynamicly
+	 */
+	if(::jconf::inst()->GetMiningAlgo() == cryptonight_heavy)
 	{
 		// version
 		if ((ret = clSetKernelArg(ctx->Kernels[2], 7, sizeof(cl_uint), &version)) != CL_SUCCESS)

diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #define XMR_STAK_NAME "xmr-stak"
-#define XMR_STAK_VERSION "2.4.0"
+#define XMR_STAK_VERSION "2.4.1"
 
 #if defined(_WIN32)
 #define OS_TYPE "win"