[OMPT-svn-commit] OpenMPT r22347 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Fri Nov 29 18:05:35 2024
New Revision: 22347
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22347

Log:
[Ref] Use FolderScanner for moving old tunings.

Modified:
   trunk/OpenMPT/mptrack/Mptrack.cpp

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	Fri Nov 29 18:02:43 2024	(r22346)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	Fri Nov 29 18:05:35 2024	(r22347)
@@ -17,6 +17,7 @@
 #include "DialogBase.h"
 #include "ExceptionHandler.h"
 #include "FileDialog.h"
+#include "FolderScanner.h"
 #include "Globals.h"
 #include "Image.h"
 #include "InputHandler.h"
@@ -1038,18 +1039,12 @@
 
 		if(mpt::native_fs{}.is_directory(oldTunings))
 		{
-			const mpt::PathString searchPattern = oldTunings + P_("*.*");
-			WIN32_FIND_DATA FindFileData;
-			HANDLE hFind;
-			hFind = FindFirstFile(mpt::support_long_path(searchPattern.AsNative()).c_str(), &FindFileData);
-			if(hFind != INVALID_HANDLE_VALUE)
+			FolderScanner scanner{oldTunings, FolderScanner::kOnlyFiles};
+			mpt::PathString fileName;
+			while(scanner.Next(fileName))
 			{
-				do
-				{
-					MoveConfigFile(mpt::PathString::FromNative(FindFileData.cFileName), P_("tunings\\"));
-				} while(FindNextFile(hFind, &FindFileData) != 0);
+				MoveConfigFile(fileName.GetFilename(), P_("tunings\\"));
 			}
-			FindClose(hFind);
 			RemoveDirectory(oldTunings.AsNative().c_str());
 		}
 	}