diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp
index 46747ce157..8e8d6f85bd 100644
--- a/Source/Core/Common/Src/Hash.cpp
+++ b/Source/Core/Common/Src/Hash.cpp
@@ -167,13 +167,7 @@ u64 GetMurmurHash3(const u8 *src, int len, u32 samples)
     const u8 * data = (const u8*)src;
     const int nblocks = len / 16;
 	u32 Step = (len / 8);
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step = Step / samples;
 	if(Step < 1) Step = 1;
 
@@ -251,13 +245,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step = Step / samples;
 	if(Step < 1) Step = 1;
 	while(data < end)
@@ -287,13 +275,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step = Step / samples;
 	if(Step < 1) Step = 1;
 	while(data < end)
@@ -336,13 +318,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples)
 	u32 Step = (len/4);
 	const u32 *data = (const u32 *)src;
 	const u32 *end = data + Step;
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step  = Step / samples;
 	if(Step < 1) Step = 1;
 	while(data < end)
@@ -414,13 +390,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples)
 	u32 out[2];
 	const int nblocks = len / 8;
 	u32 Step = (len / 4);
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step = Step / samples;
 	if(Step < 1) Step = 1;
 
@@ -494,13 +464,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
 	u32 Step = (len / 8);
 	const u64 *data = (const u64 *)src;
 	const u64 *end = data + Step;
-	if(samples == 0)
-	{
-		if (Step == 0)
-			samples = 1;
-		else
-			samples = Step;
-	}
+	if(samples == 0) samples = max(Step, 1u);
 	Step = Step / samples;
 	if(Step < 1) Step = 1;
 	while(data < end)