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

Fix segfault from status bar

Browse source 
Pass just the relevant data through the signals to the status bar, instead of passing the entire Work object.
That way the data is detached from the Work object and we won't segfault when Work self-deletes before status bar tries to use that data.
This commit is contained in:
RickyRister 2025-07-04 22:13:00 -07:00
parent 18cbf520e3
commit 0ce1281eca
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.cpp
View file

@ -2,23 +2,22 @@
PictureLoaderRequestStatusDisplayWidget::PictureLoaderRequestStatusDisplayWidget(QWidget *parent, PictureLoaderRequestStatusDisplayWidget::PictureLoaderRequestStatusDisplayWidget(QWidget *parent,
const QUrl &_url, const QUrl &_url,
PictureLoaderWorkerWork *worker) const CardInfoPtr &card,
const QString &setName)
: QWidget(parent) : QWidget(parent)
{ {
layout = new QHBoxLayout(this); layout = new QHBoxLayout(this);
if (worker->cardToDownload.getCard()) { name = new QLabel(this);
name = new QLabel(this); name->setText(card->getName());
name->setText(worker->cardToDownload.getCard()->getName()); setShortname = new QLabel(this);
setShortname = new QLabel(this); setShortname->setText(setName);
setShortname->setText(worker->cardToDownload.getSetName()); providerId = new QLabel(this);
providerId = new QLabel(this); providerId->setText(card->getProperty("uuid"));
providerId->setText(worker->cardToDownload.getCard()->getProperty("uuid"));
layout->addWidget(name); layout->addWidget(name);
layout->addWidget(setShortname); layout->addWidget(setShortname);
layout->addWidget(providerId); layout->addWidget(providerId);
}
startTime = new QLabel(QDateTime::currentDateTime().toString(), this); startTime = new QLabel(QDateTime::currentDateTime().toString(), this);
elapsedTime = new QLabel("0", this); elapsedTime = new QLabel("0", this);

6
cockatrice/src/client/ui/picture_loader/picture_loader_request_status_display_widget.h
View file

@ -10,8 +10,10 @@ class PictureLoaderRequestStatusDisplayWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
PictureLoaderRequestStatusDisplayWidget(QWidget *parent, const QUrl &url, PictureLoaderWorkerWork *worker); PictureLoaderRequestStatusDisplayWidget(QWidget *parent,
PictureLoaderWorkerWork *worker; const QUrl &url,
const CardInfoPtr &card,
const QString &setName);
void setFinished() void setFinished()
{ {

7
cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.cpp
View file

@ -38,15 +38,14 @@ void PictureLoaderStatusBar::cleanOldEntries()
} }
} }
void PictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, PictureLoaderWorkerWork *worker) void PictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const CardInfoPtr &card, const QString &setName)
{ {
loadLog->addSettingsWidget(new PictureLoaderRequestStatusDisplayWidget(loadLog, url, worker)); loadLog->addSettingsWidget(new PictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName));
progressBar->setMaximum(progressBar->maximum() + 1); progressBar->setMaximum(progressBar->maximum() + 1);
} }
void PictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url, PictureLoaderWorkerWork *worker) void PictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url)
{ {
Q_UNUSED(worker)
progressBar->setValue(progressBar->value() + 1); progressBar->setValue(progressBar->value() + 1);
for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
loadLog->popup->findChildren<PictureLoaderRequestStatusDisplayWidget *>()) { loadLog->popup->findChildren<PictureLoaderRequestStatusDisplayWidget *>()) {

4
cockatrice/src/client/ui/picture_loader/picture_loader_status_bar.h
View file

@ -15,8 +15,8 @@ public:
explicit PictureLoaderStatusBar(QWidget *parent); explicit PictureLoaderStatusBar(QWidget *parent);
public slots: public slots:
void addQueuedImageLoad(const QUrl &url, PictureLoaderWorkerWork *worker); void addQueuedImageLoad(const QUrl &url, const CardInfoPtr &card, const QString &setName);
void addSuccessfulImageLoad(const QUrl &url, PictureLoaderWorkerWork *worker); void addSuccessfulImageLoad(const QUrl &url);
void cleanOldEntries(); void cleanOldEntries();
private: private:

4
cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
View file

@ -72,7 +72,7 @@ void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork
makeRequest(url, worker); makeRequest(url, worker);
} else { } else {
requestLoadQueue.append(qMakePair(url, worker)); requestLoadQueue.append(qMakePair(url, worker));
emit imageLoadQueued(url, worker); emit imageLoadQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
processQueuedRequests(); processQueuedRequests();
} }
} }
@ -82,7 +82,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
// Check for cached redirects // Check for cached redirects
QUrl cachedRedirect = getCachedRedirect(url); QUrl cachedRedirect = getCachedRedirect(url);
if (!cachedRedirect.isEmpty()) { if (!cachedRedirect.isEmpty()) {
emit imageLoadSuccessful(url, worker); emit imageLoadSuccessful(url);
return makeRequest(cachedRedirect, worker); return makeRequest(cachedRedirect, worker);
} }

4
cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
View file

@ -71,8 +71,8 @@ private slots:
signals: signals:
void imageLoadEnqueued(const CardInfoPtr &card); void imageLoadEnqueued(const CardInfoPtr &card);
void imageLoaded(CardInfoPtr card, const QImage &image); void imageLoaded(CardInfoPtr card, const QImage &image);
void imageLoadQueued(const QUrl &url, PictureLoaderWorkerWork *worker); void imageLoadQueued(const QUrl &url, const CardInfoPtr &card, const QString &setName);
void imageLoadSuccessful(const QUrl &url, PictureLoaderWorkerWork *worker); void imageLoadSuccessful(const QUrl &url);
}; };
#endif // PICTURE_LOADER_WORKER_H #endif // PICTURE_LOADER_WORKER_H