From cf3a87ed55f9ed721a89730f6b17dd5c8b67989b Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 15 Aug 2015 14:25:55 +0800
Subject: [PATCH] Use native path separators, fixup of 030dd9e, 3baec1c.

---
 src/app/application.cpp                 | 3 ++-
 src/gui/properties/propertieswidget.cpp | 2 +-
 src/gui/torrentmodel.cpp                | 2 +-
 src/webui/btjson.cpp                    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/application.cpp b/src/app/application.cpp
index d5e162e12..9620ec24d 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -60,6 +60,7 @@
 #include "application.h"
 #include "core/logger.h"
 #include "core/preferences.h"
+#include "core/utils/fs.h"
 #include "core/utils/misc.h"
 #include "core/iconprovider.h"
 #include "core/scanfoldersmodel.h"
@@ -146,7 +147,7 @@ void Application::torrentFinished(BitTorrent::TorrentHandle *const torrent)
         program.replace("%N", torrent->name());
         program.replace("%F", (file_count > 1) ? "" : torrent->fileName(0));
         program.replace("%L", torrent->label());
-        program.replace("%D", torrent->rootPath());
+        program.replace("%D", Utils::Fs::toNativePath(torrent->rootPath()));
         program.replace("%K", (file_count > 1) ? "multi" : "single");
         program.replace("%C", QString::number(torrent->filesCount()));
         program.replace("%Z", QString::number(torrent->totalSize()));
diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp
index dbcde3f3d..e64c664d6 100644
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@@ -252,7 +252,7 @@ BitTorrent::TorrentHandle *PropertiesWidget::getCurrentTorrent() const
 void PropertiesWidget::updateSavePath(BitTorrent::TorrentHandle *const torrent)
 {
   if (m_torrent == torrent) {
-    save_path->setText(m_torrent->rootPath());
+    save_path->setText(Utils::Fs::toNativePath(m_torrent->rootPath()));
   }
 }
 
diff --git a/src/gui/torrentmodel.cpp b/src/gui/torrentmodel.cpp
index 027d43bd8..c27dd3241 100644
--- a/src/gui/torrentmodel.cpp
+++ b/src/gui/torrentmodel.cpp
@@ -221,7 +221,7 @@ QVariant TorrentModel::data(const QModelIndex &index, int role) const
     case TR_TIME_ELAPSED:
         return (role == Qt::DisplayRole) ? torrent->activeTime() : torrent->seedingTime();
     case TR_SAVE_PATH:
-        return torrent->rootPath();
+        return Utils::Fs::toNativePath(torrent->rootPath());
     case TR_COMPLETED:
         return torrent->completedSize();
     case TR_RATIO_LIMIT:
diff --git a/src/webui/btjson.cpp b/src/webui/btjson.cpp
index c6fd94a62..44addf7f0 100644
--- a/src/webui/btjson.cpp
+++ b/src/webui/btjson.cpp
@@ -509,7 +509,7 @@ QByteArray btjson::getPropertiesForTorrent(const QString& hash)
         dataDict[KEY_PROP_COMPLETION_DATE] = -1;
         dataDict[KEY_PROP_CREATION_DATE] = -1;
     }
-    dataDict[KEY_PROP_SAVE_PATH] = torrent->savePathParsed();
+    dataDict[KEY_PROP_SAVE_PATH] = Utils::Fs::toNativePath(torrent->rootPath());
     dataDict[KEY_PROP_COMMENT] = torrent->comment();
 
     return json::toJson(dataDict);