prompt for content download only inside battleroom

springlobby · Mar 23, 2016 · fd5cfb2 · fd5cfb2
1 parent 308436c
commit fd5cfb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/gui/battlelist/battlelisttab.cpp b/src/gui/battlelist/battlelisttab.cpp
@@ -423,8 +423,6 @@ void BattleListTab::DoJoin(IBattle& battle)
 	battle.Join(STD_STRING(password));
 	//Change Tab to show user joining to battle is in progress
 	ui().mw().ShowTab(MainWindow::PAGE_JOIN);
-
-	ui().NeedsDownload(&battle, false);
 }
 
 /**

diff --git a/src/gui/hosting/battleroomtab.cpp b/src/gui/hosting/battleroomtab.cpp
@@ -408,7 +408,6 @@ void BattleRoomTab::UpdateBattleInfo()
 		UpdateBattleInfo(it->first);
 	}
 	UpdateMapInfoSummary();
-
 }
 
 void BattleRoomTab::PrintAllySetup()
@@ -1199,6 +1198,10 @@ void BattleRoomTab::SetBattle(IBattle* battle)
 	} else {
 		m_host_new_btn->Show(true);
 	}
+
+	if (battle != nullptr) { //prevents deadlock at start
+		ui().NeedsDownload(battle);
+	}
 }
 
 void BattleRoomTab::RegenerateOptionsList()