Merge pull request #4802 from shikadiqueen/bug/3273

gui2/addon_manager: Re-read add-on versions after each update batch

changelog.md

@@ -1,4 +1,7 @@
 ## Version 1.15.3+dev
+ ### Add-ons client
+   * Ensure the client doesn't re-download dependencies that have just been updated during an Update All
+     run by re-reading add-on versions after each update batch (issue #3273).
  ### Campaigns
    * Delfador's Memoirs:
      * S12: Fix a few case where dialog and events sound odd or fire out of order (issue #4614)

src/gui/dialogs/addon/manager.cpp

@@ -704,6 +704,13 @@ void addon_manager::update_all_addons(window& window)
 		if(tracking_info_[a.first].state == ADDON_INSTALLED_UPGRADABLE) {
 			addons_client::install_result result = client_.install_addon_with_checks(addons_, a.second);
 
+			if(result.wml_changed) {
+				// Updating an add-on may have resulted in its dependencies being updated
+				// as well, so we need to reread version info blocks afterwards to make sure
+				// we don't try to re-download newly updated add-ons.
+				refresh_addon_version_info_cache();
+			}
+
 			// Take note if any wml_changes occurred
 			need_wml_cache_refresh_ |= result.wml_changed;
 		}