Fix merge bug

johnml1135 · johnml1135 · commit 76e0c6bc6ef3 · 2025-12-10T15:44:06.000-05:00
diff --git a/Src/Generic/Util.cpp b/Src/Generic/Util.cpp
@@ -2660,7 +2660,7 @@ StrUni DirectoryFinder::FwRootCodeDir()
 	if (!stuResult.Length())
 	{
 		wchar_t modulePath[MAX_PATH];
-		dwT = ::GetModuleFileName(NULL, modulePath, MAX_PATH);
+		DWORD dwT = ::GetModuleFileName(NULL, modulePath, MAX_PATH);
 		if (dwT > 0)
 		{
 			wchar_t * lastSlash = wcsrchr(modulePath, L'\\');

Original file line number	Diff line number	Diff line change
`@@ -2660,7 +2660,7 @@ StrUni DirectoryFinder::FwRootCodeDir()`
`2660`	`2660`	`if (!stuResult.Length())`
`2661`	`2661`	`{`
`2662`	`2662`	`wchar_t modulePath[MAX_PATH];`
`2663`		`- dwT = ::GetModuleFileName(NULL, modulePath, MAX_PATH);`
	`2663`	`+ DWORD dwT = ::GetModuleFileName(NULL, modulePath, MAX_PATH);`
`2664`	`2664`	`if (dwT > 0)`
`2665`	`2665`	`{`
`2666`	`2666`	`wchar_t * lastSlash = wcsrchr(modulePath, L'\\');`