github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 13:53:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5249 from evsh/auto-remove-torrents

Browse source 
Fix a typo in TorrentFileGuard and a crash when adding torrent via magnet link
This commit is contained in:
sledgehammer999 2016-05-15 15:59:37 -05:00
commit 4f78a50add
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/base/torrentfileguard.cpp
View file

@ -84,7 +84,7 @@ TorrentFileGuard::AutoDeleteMode TorrentFileGuard::autoDeleteMode()
KEY_AUTO_DELETE_ENABLED, meta.valueToKey(Never)).toByteArray())); KEY_AUTO_DELETE_ENABLED, meta.valueToKey(Never)).toByteArray()));
} }
void TorrentFileGuard::setautoDeleteMode(TorrentFileGuard::AutoDeleteMode mode) void TorrentFileGuard::setAutoDeleteMode(TorrentFileGuard::AutoDeleteMode mode)
{ {
QMetaEnum meta {modeMetaEnum()}; QMetaEnum meta {modeMetaEnum()};
SettingsStorage::instance()->storeValue(KEY_AUTO_DELETE_ENABLED, meta.valueToKey(mode)); SettingsStorage::instance()->storeValue(KEY_AUTO_DELETE_ENABLED, meta.valueToKey(mode));

2
src/base/torrentfileguard.h
View file

@ -68,7 +68,7 @@ public:
// static interface to get/set preferences // static interface to get/set preferences
static AutoDeleteMode autoDeleteMode(); static AutoDeleteMode autoDeleteMode();
static void setautoDeleteMode(AutoDeleteMode mode); static void setAutoDeleteMode(AutoDeleteMode mode);
private: private:
static QMetaEnum modeMetaEnum(); static QMetaEnum modeMetaEnum();

1
src/gui/addnewtorrentdialog.cpp
View file

@ -259,6 +259,7 @@ bool AddNewTorrentDialog::loadMagnet(const BitTorrent::MagnetUri &magnetUri)
return false; return false;
} }
m_torrentGuard.reset(new TorrentFileGuard(QString()));
m_hash = magnetUri.hash(); m_hash = magnetUri.hash();
// Prevent showing the dialog if download is already present // Prevent showing the dialog if download is already present
if (BitTorrent::Session::instance()->isKnownTorrent(m_hash)) { if (BitTorrent::Session::instance()->isKnownTorrent(m_hash)) {

2
src/gui/options_imp.cpp
View file

@ -519,7 +519,7 @@ void options_imp::saveOptions()
pref->setAutoRunProgram(autoRun_txt->text().trimmed()); pref->setAutoRunProgram(autoRun_txt->text().trimmed());
pref->setActionOnDblClOnTorrentDl(getActionOnDblClOnTorrentDl()); pref->setActionOnDblClOnTorrentDl(getActionOnDblClOnTorrentDl());
pref->setActionOnDblClOnTorrentFn(getActionOnDblClOnTorrentFn()); pref->setActionOnDblClOnTorrentFn(getActionOnDblClOnTorrentFn());
TorrentFileGuard::setautoDeleteMode(!deleteTorrentBox->isChecked() ? TorrentFileGuard::Never TorrentFileGuard::setAutoDeleteMode(!deleteTorrentBox->isChecked() ? TorrentFileGuard::Never
: !deleteCancelledTorrentBox->isChecked() ? TorrentFileGuard::IfAdded : !deleteCancelledTorrentBox->isChecked() ? TorrentFileGuard::IfAdded
: TorrentFileGuard::Always); : TorrentFileGuard::Always);
// End Downloads preferences // End Downloads preferences