From 767e83c87978a8d9b5a7ea9b7771c25380b6f929 Mon Sep 17 00:00:00 2001 From: Zach H Date: Mon, 13 Jan 2025 23:33:04 -0500 Subject: [PATCH] Disable Force Start for host on load (#5462) - Fix #5444 --- cockatrice/src/client/tabs/tab_game.cpp | 3 +++ vcpkg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index 6e3f07cf5..89c07b02c 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -135,6 +135,7 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent) buttonHBox->addWidget(sideboardLockButton); if (forceStartGameButton->isEnabled()) { buttonHBox->addWidget(forceStartGameButton); + forceStartGameButton->setEnabled(false); } buttonHBox->setContentsMargins(0, 0, 0, 0); buttonHBox->addStretch(); @@ -331,6 +332,7 @@ void DeckViewContainer::unloadDeck() readyStartButton->setState(false); sideboardLockButton->setEnabled(false); sideboardLockButton->setState(false); + forceStartGameButton->setEnabled(false); setReadyStart(false); } @@ -457,6 +459,7 @@ void DeckViewContainer::setDeck(const DeckLoader &deck) readyStartButton->setEnabled(true); sideboardLockButton->setState(false); sideboardLockButton->setEnabled(true); + forceStartGameButton->setEnabled(true); } TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) diff --git a/vcpkg b/vcpkg index 3a7ee5613..8ec31e98f 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 3a7ee5613c81f5a49316948eeb0e304a14dfb50a +Subproject commit 8ec31e98fb07e3f9c2e5b6aed0737a76a693fc72