4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3038

Browse Source 
6898d5d oshelper: always convert to canonical path in openContainingFolder (xiphon)
This commit is contained in:
luigi1111 2020-08-14 14:16:19 -05:00
commit e65159163d
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
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);