merge fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-07-17 20:23:30 +00:00
parent 9c9135bfc4
commit 4cacb5f351
1 changed files with 4 additions and 1 deletions

View File

@ -123,7 +123,10 @@ namespace libtorrent
#endif #endif
sha1_hash const& info_hash() const sha1_hash const& info_hash() const
{ return m_torrent_file ? m_torrent_file->info_hash() : sha1_hash(); } {
static sha1_hash empty;
return m_torrent_file ? m_torrent_file->info_hash() : empty;
}
// starts the announce timer // starts the announce timer
void start(); void start();