From 8bd8426f04b160b68d2f77f224611859583aba03 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 26 Oct 2014 17:48:50 +0000 Subject: [PATCH] merged changes from RC_1_0 --- ChangeLog | 1 + src/torrent.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f394b2360..65692cfed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ 1.0.3 release + * fix incorrect behavior of flag_use_resume_save_path * fix protocol race-condition in super seeding mode * support read-only DHT nodes * remove unused partial hash DHT lookups diff --git a/src/torrent.cpp b/src/torrent.cpp index 54cd20ba1..5fbe64bd5 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -1731,7 +1731,7 @@ namespace libtorrent // loading resume data. So peek ahead in this case. // only do this if the user is willing to have the resume data // settings override the settings set in add_torrent_params - if (!m_use_resume_save_path + if (m_use_resume_save_path && m_resume_data && m_resume_data->entry.type() == lazy_entry::dict_t) { @@ -6517,7 +6517,7 @@ namespace libtorrent } super_seeding(rd.dict_find_int_value("super_seeding", 0)); - if (!m_use_resume_save_path) + if (m_use_resume_save_path) { std::string p = rd.dict_find_string_value("save_path"); if (!p.empty()) m_save_path = p;