d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 14:57:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17281 from Chocobo1/creator

Browse Source 
Fix filename not populated correctly
This commit is contained in:
Chocobo1 2022-07-02 14:41:50 +08:00 committed by GitHub
commit b44bdd21cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base/path.cpp
View File

@ -115,6 +115,11 @@ Path Path::rootItem() const
if (slashIndex == 0) // *nix absolute path
return createUnchecked(u"/"_qs);
#ifdef Q_OS_WIN
// should be `c:/` instead of `c:`
if (m_pathStr.at(slashIndex - 1) == u':')
return createUnchecked(m_pathStr.left(slashIndex + 1));
#endif
return createUnchecked(m_pathStr.left(slashIndex));
}
@ -127,6 +132,12 @@ Path Path::parentPath() const
if (slashIndex == 0) // *nix absolute path
return (m_pathStr.size() == 1) ? Path() : createUnchecked(u"/"_qs);
#ifdef Q_OS_WIN
// should be `c:/` instead of `c:`
// Windows "drive letter" is limited to one alphabet
if ((slashIndex == 2) && (m_pathStr.at(1) == u':'))
return createUnchecked(m_pathStr.left(slashIndex + 1));
#endif
return createUnchecked(m_pathStr.left(slashIndex));
}

4
src/gui/torrentcreatordialog.cpp
View File

@ -180,8 +180,8 @@ void TorrentCreatorDialog::onCreateButtonClicked()
}
// get save path
const Path savePath = m_storeLastSavePath.get(Utils::Fs::homePath() / Path(inputPath.filename() + u".torrent"));
Path destPath {QFileDialog::getSaveFileName(this, tr("Select where to save the new torrent"), savePath.data(), tr("Torrent Files (*.torrent)"))};
const Path lastSavePath = (m_storeLastSavePath.get(Utils::Fs::homePath()) / Path(inputPath.filename() + u".torrent"));
Path destPath {QFileDialog::getSaveFileName(this, tr("Select where to save the new torrent"), lastSavePath.data(), tr("Torrent Files (*.torrent)"))};
if (destPath.isEmpty())
return;
if (!destPath.hasExtension(TORRENT_FILE_EXTENSION))