monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

oshelper: always convert to canonical path in openContainingFolder

Browse source
This commit is contained in:
xiphon 2020-08-06 18:58:15 +00:00
parent 7eeda0a8f0
commit 6898d5dd42
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/oshelper.cpp
View file

@ -92,22 +92,23 @@ QString OSHelper::downloadLocation() const
bool OSHelper::openContainingFolder(const QString &filePath) const
{
QString canonicalFilePath = QFileInfo(filePath).canonicalFilePath();
#if defined(Q_OS_WIN)
if (openFolderAndSelectItem(QDir::toNativeSeparators(filePath)))
if (openFolderAndSelectItem(QDir::toNativeSeparators(canonicalFilePath)))
{
return true;
}
#elif defined(Q_OS_MAC)
if (MacOSHelper::openFolderAndSelectItem(QUrl::fromLocalFile(filePath)))
if (MacOSHelper::openFolderAndSelectItem(QUrl::fromLocalFile(canonicalFilePath)))
{
return true;
}
#endif
QUrl url = QUrl::fromLocalFile(QFileInfo(filePath).absolutePath());
QUrl url = QUrl::fromLocalFile(canonicalFilePath);
if (!url.isValid())
{
qWarning() << "Malformed file path" << filePath << url.errorString();
qWarning() << "Malformed file path" << canonicalFilePath << url.errorString();
return false;
}
return QDesktopServices::openUrl(url);