jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 16:32:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[DeckShare] Wire the status-changed handler after shareBar exists

Browse source 
handleConnectionChanged() dereferences shareBar->isVisible(), but the connection
was set up before shareBar was constructed and shareBar had no in-class
initializer. On any status change delivered before construction the slot read an
indeterminate pointer. Seed the connection (and the initial share availability)
after shareBar exists and give shareBar a = nullptr initializer.
This commit is contained in:
Lukas Brübach 2026-09-20 19:28:26 +02:00 • committed by GitHub
parent 2cf03124de
commit 26b17f8435
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
View file

@ -38,10 +38,6 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, Abstra
} }
}); });
connect(client, &AbstractClient::statusChanged, this, &TabDeckStorageVisual::handleConnectionChanged);
shareDeckAvailable = (client->getStatus() == StatusLoggedIn);
visualDeckStorageWidget->setShareAvailable(shareDeckAvailable);
auto *widget = new QWidget(this); auto *widget = new QWidget(this);
auto *layout = new QVBoxLayout(widget); auto *layout = new QVBoxLayout(widget);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@ -57,6 +53,10 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, Abstra
layout->insertWidget(0, shareBar); layout->insertWidget(0, shareBar);
shareBar->setVisible(false); shareBar->setVisible(false);
connect(client, &AbstractClient::statusChanged, this, &TabDeckStorageVisual::handleConnectionChanged);
shareDeckAvailable = (client->getStatus() == StatusLoggedIn);
visualDeckStorageWidget->setShareAvailable(shareDeckAvailable);
shareTimeoutTimer->setSingleShot(true); shareTimeoutTimer->setSingleShot(true);
shareTimeoutTimer->setInterval( shareTimeoutTimer->setInterval(
static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) * static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *

2
cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
View file

@ -74,7 +74,7 @@ private:
VisualDeckStorageWidget *visualDeckStorageWidget; VisualDeckStorageWidget *visualDeckStorageWidget;
ShareBarWidget *shareBar; ShareBarWidget *shareBar = nullptr;
AbstractClient *client; AbstractClient *client;
QTimer *shareTimeoutTimer; QTimer *shareTimeoutTimer;
int shareRequestSeq = 0; int shareRequestSeq = 0;