forked from premiere/premiere-libtorrent
fix merge error
This commit is contained in:
parent
ef94954f7e
commit
05aa06460d
|
@ -1222,7 +1222,6 @@ ret:
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the file has priority 0, don't allocate it
|
// if the file has priority 0, don't allocate it
|
||||||
int file_index = files().file_index(*file_iter);
|
|
||||||
if (m_allocate_files && (op.mode & file::rw_mask) != file::read_only
|
if (m_allocate_files && (op.mode & file::rw_mask) != file::read_only
|
||||||
&& (m_file_priority.size() < file_index || m_file_priority[file_index] > 0))
|
&& (m_file_priority.size() < file_index || m_file_priority[file_index] > 0))
|
||||||
{
|
{
|
||||||
|
@ -1425,7 +1424,6 @@ ret:
|
||||||
if (!m_allocate_files) mode |= file::sparse;
|
if (!m_allocate_files) mode |= file::sparse;
|
||||||
|
|
||||||
// files with priority 0 should always be sparse
|
// files with priority 0 should always be sparse
|
||||||
int file_index = fe - files().begin();
|
|
||||||
if (m_file_priority.size() > file_index && m_file_priority[file_index] == 0)
|
if (m_file_priority.size() > file_index && m_file_priority[file_index] == 0)
|
||||||
mode |= file::sparse;
|
mode |= file::sparse;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue