jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-22 22:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault when game is closed while card view window is open (#5507)

Browse source
This commit is contained in:
RickyRister 2025-01-20 19:06:55 -08:00 • committed by GitHub
parent b004e91aa4
commit aeb1b9fb4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/game/game_scene.cpp
View file

@ -29,6 +29,13 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)
GameScene::~GameScene()
{
delete animationTimer;
// DO NOT call clearViews() here
// clearViews calls close() on the zoneViews, which sends signals; sending signals in destructors leads to segfaults
// deleteLater() deletes the zoneView without allowing it to send signals
for (const auto &zoneView : zoneViews) {
zoneView->deleteLater();
}
}
void GameScene::retranslateUi()
@ -76,7 +83,7 @@ void GameScene::rearrange()
QListIterator<Player *> playersIter(players);
while (playersIter.hasNext()) {
Player *p = playersIter.next();
if (!p->getConceded()) {
if (p && !p->getConceded()) {
playersPlaying.append(p);
if (!firstPlayerFound && (p->getLocal())) {
firstPlayerIndex = playersPlaying.size() - 1;