mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-23 16:58:06 -06:00
Merge pull request #14832 from glassez/v4.3-upload-mode
Correctly handle "not enough disk space" error (v4_3_x backport)
This commit is contained in:
@@ -947,7 +947,7 @@ bool TorrentImpl::hasMissingFiles() const
|
||||
|
||||
bool TorrentImpl::hasError() const
|
||||
{
|
||||
return static_cast<bool>(m_nativeStatus.errc);
|
||||
return (m_nativeStatus.errc || (m_nativeStatus.flags & lt::torrent_flags::upload_mode));
|
||||
}
|
||||
|
||||
bool TorrentImpl::hasFilteredPieces() const
|
||||
@@ -966,7 +966,13 @@ int TorrentImpl::queuePosition() const
|
||||
|
||||
QString TorrentImpl::error() const
|
||||
{
|
||||
return QString::fromStdString(m_nativeStatus.errc.message());
|
||||
if (m_nativeStatus.errc)
|
||||
return QString::fromStdString(m_nativeStatus.errc.message());
|
||||
|
||||
if (m_nativeStatus.flags & lt::torrent_flags::upload_mode)
|
||||
return tr("There's not enough space on disk. Torrent is currently in \"upload only\" mode.");
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
qlonglong TorrentImpl::totalDownload() const
|
||||
@@ -1525,7 +1531,10 @@ void TorrentImpl::pause()
|
||||
void TorrentImpl::resume(const TorrentOperatingMode mode)
|
||||
{
|
||||
if (hasError())
|
||||
{
|
||||
m_nativeHandle.clear_error();
|
||||
m_nativeHandle.unset_flags(lt::torrent_flags::upload_mode);
|
||||
}
|
||||
|
||||
m_operatingMode = mode;
|
||||
|
||||
@@ -1748,6 +1757,9 @@ void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
|
||||
|
||||
m_ltAddTorrentParams.added_time = addedTime().toSecsSinceEpoch();
|
||||
|
||||
// We shouldn't save upload_mode flag to allow torrent operate normally on next run
|
||||
m_ltAddTorrentParams.flags &= ~lt::torrent_flags::upload_mode;
|
||||
|
||||
if (m_maintenanceJob == MaintenanceJob::HandleMetadata)
|
||||
{
|
||||
m_ltAddTorrentParams.have_pieces.clear();
|
||||
|
||||
Reference in New Issue
Block a user