From be99c459444981512dc8ef075146a389dbdfc8ef Mon Sep 17 00:00:00 2001 From: Nick Tiskov Date: Sun, 5 Oct 2014 17:34:58 +0400 Subject: [PATCH] Fix opening of samba shares --- src/properties/propertieswidget.cpp | 13 ++++++++----- src/transferlistwidget.cpp | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index ccf2eb8f9..33781d6f5 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -429,9 +429,10 @@ void PropertiesWidget::openFile(const QModelIndex &index) { // Flush data h.flush_cache(); if (QFile::exists(file_path)) { - // Hack to access samba shares with QDesktopServices::openUrl - const QString p = file_path.startsWith("//") ? QString("file:") + file_path : file_path; - QDesktopServices::openUrl(QUrl::fromLocalFile(p)); + if (file_path.startsWith("//")) + QDesktopServices::openUrl(fsutils::toNativePath("file:" + file_path)); + else + QDesktopServices::openUrl(QUrl::fromLocalFile(file_path)); } else { QMessageBox::warning(this, tr("I/O Error"), tr("This file does not exist yet.")); @@ -471,8 +472,10 @@ void PropertiesWidget::openFolder(const QModelIndex &index, bool containing_fold #endif if (QFile::exists(file_path)) { // Hack to access samba shares with QDesktopServices::openUrl - const QString p = file_path.startsWith("//") ? QString("file:") + file_path : file_path; - QDesktopServices::openUrl(QUrl::fromLocalFile(p)); + if (file_path.startsWith("//")) + QDesktopServices::openUrl(fsutils::toNativePath("file:" + file_path)); + else + QDesktopServices::openUrl(QUrl::fromLocalFile(file_path)); } else { QMessageBox::warning(this, tr("I/O Error"), tr("This folder does not exist yet.")); } diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp index 00a99ac61..2b9a09614 100644 --- a/src/transferlistwidget.cpp +++ b/src/transferlistwidget.cpp @@ -633,8 +633,10 @@ void TransferListWidget::askNewLabelForSelection() { bool TransferListWidget::openUrl(const QString &_path) const { const QString path = fsutils::fromNativePath(_path); // Hack to access samba shares with QDesktopServices::openUrl - const QString p = path.startsWith("//") ? QString("file:") + path : path; - return QDesktopServices::openUrl(QUrl::fromLocalFile(p)); + if (path.startsWith("//")) + return QDesktopServices::openUrl(fsutils::toNativePath("file:" + path)); + else + return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); } void TransferListWidget::renameSelectedTorrent() {