From 05aa06460db9b7e079c6392eb054568109f62401 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 26 Jan 2014 02:40:09 +0000 Subject: [PATCH] fix merge error --- src/storage.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/storage.cpp b/src/storage.cpp index 046bd5750..2c651bd1c 100644 --- a/src/storage.cpp +++ b/src/storage.cpp @@ -1222,7 +1222,6 @@ ret: } // 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 && (m_file_priority.size() < file_index || m_file_priority[file_index] > 0)) { @@ -1425,7 +1424,6 @@ ret: if (!m_allocate_files) mode |= file::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) mode |= file::sparse;