diff --git a/checkin_notes b/checkin_notes index 8e3ce0168f..3c084b96e0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7859,8 +7859,10 @@ David 21 Dec 2012 Charlie 22 Dec 2012 - Mgr: When removing entries from our hash table, delete data to avoid memory leaks. - -Mgr: Allow existing to retrieve images or other items from the Internet even - if network activity is suspended. (But client won't get new notices.) + - Mgr: Allow existing notices to retrieve images or other items from the + Internet even if network activity is suspended. (But client won't get + new notices.) + - Mgr: Reset Internet timeout when retrying notices. clientgui/ BOINCInternetFSHandler.cpp diff --git a/clientgui/BOINCInternetFSHandler.cpp b/clientgui/BOINCInternetFSHandler.cpp index 0fb721b019..b6f372c6f3 100755 --- a/clientgui/BOINCInternetFSHandler.cpp +++ b/clientgui/BOINCInternetFSHandler.cpp @@ -606,12 +606,18 @@ void CBOINCInternetFSHandler::UnchacheMissingItems() { } } m_bMissingItems = false; +#ifdef __WXMSW__ + dInternetTimeout = STANDARD_INTERNET_TIMEOUT; +#endif } void CBOINCInternetFSHandler::ClearCache() { WX_CLEAR_HASH_TABLE(*m_Hash); m_bMissingItems = false; +#ifdef __WXMSW__ + dInternetTimeout = STANDARD_INTERNET_TIMEOUT; +#endif }