From 6753b456271f05389852771eb883e70fb0950abb Mon Sep 17 00:00:00 2001 From: rakshasa Date: Wed, 19 Nov 2008 17:25:52 +0000 Subject: [PATCH] * Bumped version numbers. * Fixed inconsistent handling of d.get_base_path for single and multi-torrents. Now both return the cached path even though the torrent is closed and a new root directory set. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1085 e378c898-3ddf-0310-93e7-cc216c733640 --- configure.ac | 4 ++-- src/command_download.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 7bd0131f..8e773189 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(rtorrent, 0.8.3, jaris@ifi.uio.no) +AC_INIT(rtorrent, 0.8.4, jaris@ifi.uio.no) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) @@ -34,7 +34,7 @@ PKG_CHECK_MODULES(libcurl, libcurl >= 7.15.4, CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; LIBS="$LIBS $libcurl_LIBS") -PKG_CHECK_MODULES(libtorrent, libtorrent >= 0.12.2, +PKG_CHECK_MODULES(libtorrent, libtorrent >= 0.12.4, CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS"; LIBS="$LIBS $libtorrent_LIBS") diff --git a/src/command_download.cc b/src/command_download.cc index c55b7bac..88e0515c 100644 --- a/src/command_download.cc +++ b/src/command_download.cc @@ -63,9 +63,9 @@ std::string retrieve_d_base_path(core::Download* download) { if (download->file_list()->is_multi_file()) - return download->file_list()->root_dir(); + return download->file_list()->frozen_root_dir(); else - return download->file_list()->at(0)->frozen_path(); + return download->file_list()->empty() ? std::string() : download->file_list()->at(0)->frozen_path(); } std::string @@ -73,7 +73,7 @@ retrieve_d_base_filename(core::Download* download) { const std::string* base; if (download->file_list()->is_multi_file()) - base = &download->file_list()->root_dir(); + base = &download->file_list()->frozen_root_dir(); else base = &download->file_list()->at(0)->frozen_path();