Browse Source

Merge pull request #6489 from evsh/fix-fileguard

Fix TorrentFileGuard::setAutoRemove() recursion problem. Closes #6488.
adaptive-webui-19844
sledgehammer999 8 years ago committed by GitHub
parent
commit
9eb01fbe4d
  1. 5
      src/base/torrentfileguard.cpp
  2. 2
      src/base/torrentfileguard.h

5
src/base/torrentfileguard.cpp

@ -77,11 +77,6 @@ void TorrentFileGuard::markAsAddedToSession()
m_wasAdded = true; m_wasAdded = true;
} }
void TorrentFileGuard::setAutoRemove(bool remove)
{
setAutoRemove(remove);
}
TorrentFileGuard::AutoDeleteMode TorrentFileGuard::autoDeleteMode() TorrentFileGuard::AutoDeleteMode TorrentFileGuard::autoDeleteMode()
{ {
QMetaEnum meta {modeMetaEnum()}; QMetaEnum meta {modeMetaEnum()};

2
src/base/torrentfileguard.h

@ -60,7 +60,7 @@ public:
/// marks the torrent file as loaded (added) into the BitTorrent::Session /// marks the torrent file as loaded (added) into the BitTorrent::Session
void markAsAddedToSession(); void markAsAddedToSession();
void setAutoRemove(bool remove); using FileGuard::setAutoRemove;
enum AutoDeleteMode // do not change these names: they are stored in config file enum AutoDeleteMode // do not change these names: they are stored in config file
{ {

Loading…
Cancel
Save