diff --git a/src/common/utility/cmdlib.cpp b/src/common/utility/cmdlib.cpp
index 72485011d01..9551cbf42ac 100644
--- a/src/common/utility/cmdlib.cpp
+++ b/src/common/utility/cmdlib.cpp
@@ -331,13 +331,8 @@ FString ExtractFileBase (const char *path, bool include_extension)
 		}
 #endif
 
-		if (!include_extension)
+		if (!include_extension && (dot = strrchr(src, '.')))
 		{
-			dot = src;
-			while (*dot && *dot != '.')
-			{
-				dot++;
-			}
 			return FString(src, dot - src);
 		}
 		else