MainFrm: Use GetFileName() when saving subtitles.

Fixes cases where URLs are being used as a suggested subtitle filename.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
index 576bea074..5f428b347 100644
--- a/src/mpc-hc/MainFrm.cpp
+++ b/src/mpc-hc/MainFrm.cpp
@@ -5329,14 +5329,14 @@ void CMainFrame::OnFileSavesubtitle()
             return;

         }

 

-        OpenMediaData* pOMD = m_wndPlaylistBar.GetCurOMD();

-        CString suggestedFileName(_T(""));

-        if (OpenFileData* p = dynamic_cast<OpenFileData*>(pOMD)) {

-            // HACK: get the file name from the current playlist item

-            suggestedFileName = m_wndPlaylistBar.GetCurFileName();

-            suggestedFileName = suggestedFileName.Left(suggestedFileName.ReverseFind('.')); // exclude the extension, it will be auto completed

-        }

-        delete pOMD;

+        CPath suggestedFileName(GetFileName());

+        suggestedFileName.RemoveExtension(); // exclude the extension, it will be auto-completed

+

+        // Try to detect the directory of the current playlist item, and prepend it if it's valid

+        CPath path(m_wndPlaylistBar.GetCurFileName());

+        if (path.RemoveFileSpec() && path.IsDirectory() && path.Append(suggestedFileName)) {

+            suggestedFileName = path;

+        }

 

         if (clsid == __uuidof(CVobSubFile)) {

             CVobSubFile* pVSF = (CVobSubFile*)(ISubStream*)pSubInput->subStream;