Browse Source

Don't remove shared temp folder

adaptive-webui-19844
Vladimir Golovnev (qlassez) 7 years ago committed by Vladimir Golovnev
parent
commit
f067b8b37c
  1. 13
      src/base/bittorrent/session.cpp
  2. 3
      src/base/bittorrent/torrenthandle.h

13
src/base/bittorrent/session.cpp

@ -1651,14 +1651,13 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles) @@ -1651,14 +1651,13 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
// Remove it from session
if (deleteLocalFiles) {
if (torrent->savePath(true) == torrentTempPath(torrent->info())) {
QString rootPath = torrent->rootPath(true);
if (!rootPath.isEmpty())
// torrent with root folder
m_savePathsToRemove[torrent->hash()] = rootPath;
else if (torrent->useTempPath())
// torrent without root folder still has it in its temporary save path
m_savePathsToRemove[torrent->hash()] = torrent->savePath(true);
}
else {
QString rootPath = torrent->rootPath(true);
if (!rootPath.isEmpty())
m_savePathsToRemove[torrent->hash()] = rootPath;
}
m_nativeSession->remove_torrent(torrent->nativeHandle(), libt::session::delete_files);
}
else {

3
src/base/bittorrent/torrenthandle.h

@ -244,6 +244,8 @@ namespace BitTorrent @@ -244,6 +244,8 @@ namespace BitTorrent
QString rootPath(bool actual = false) const;
QString contentPath(bool actual = false) const;
bool useTempPath() const;
bool isAutoTMMEnabled() const;
void setAutoTMMEnabled(bool enabled);
QString category() const;
@ -416,7 +418,6 @@ namespace BitTorrent @@ -416,7 +418,6 @@ namespace BitTorrent
void handleStatsAlert(libtorrent::stats_alert *p);
bool isMoveInProgress() const;
bool useTempPath() const;
QString nativeActualSavePath() const;
void adjustActualSavePath();

Loading…
Cancel
Save