DSUtil: удалена функция AddExtension.

Aleksoid1978 · Sep 13, 2024 · 0ed3df9 · 0ed3df9
1 parent d565a77
commit 0ed3df9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/src/DSUtil/FileHandle.cpp b/src/DSUtil/FileHandle.cpp
@@ -130,14 +130,6 @@ CStringW GetRenameFileExt(LPCWSTR Path, LPCWSTR newExt)
  return newPath;
 }
 
-CStringW AddExtension(LPCWSTR Path, LPCWSTR Ext)
-{
- CStringW cs = Path;
- ::PathAddExtensionW(cs.GetBuffer(MAX_PATH), Ext);
- cs.ReleaseBuffer(-1);
- return cs;
-}
-
 void CombineFilePath(CStringW& path, LPCWSTR file)
 {
  if (file) {

diff --git a/src/DSUtil/FileHandle.h b/src/DSUtil/FileHandle.h
@@ -44,8 +44,6 @@ void RenameFileExt(CStringW& Path, LPCWSTR newExt);
 // creates a new path with a new file extension
 CStringW GetRenameFileExt(LPCWSTR Path, LPCWSTR newExt);
 
-CStringW AddExtension(LPCWSTR Path, LPCWSTR Ext);
-
 void CombineFilePath(CStringW& path, LPCWSTR file);
 CStringW GetCombineFilePath(LPCWSTR dir, LPCWSTR file);
 

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
@@ -6047,8 +6047,8 @@ void CMainFrame::OnFileSaveAs()
  }
 
  CStringW savedFileName(fd.GetPathName());
- if (ext.GetLength()) {
- savedFileName = AddExtension(savedFileName, ext);
+ if (ext.GetLength() && GetFileExt(savedFileName).IsEmpty()) {
+ savedFileName.Append(ext);
  }
 
  OAFilterState fs = State_Stopped;