jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

carddb thread fix; added VG, AE, PCH to sets

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-02-21 18:18:08 +01:00
parent acac5addd6
commit 1151077c1e
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/carddatabase.cpp
View file

@ -223,7 +223,6 @@ void PictureLoader::setPicDownload(bool _picDownload)
PictureLoadingThread::PictureLoadingThread(const QString &_picsPath, bool _picDownload, QObject *parent)
: QThread(parent), picsPath(_picsPath), picDownload(_picDownload)
{
initMutex.lock();
}
PictureLoadingThread::~PictureLoadingThread()
@ -239,12 +238,22 @@ void PictureLoadingThread::run()
pictureLoader->setPicsPath(picsPath);
pictureLoader->setPicDownload(picDownload);
initMutex.unlock();
usleep(100);
initWaitCondition.wakeAll();
exec();
delete pictureLoader;
}
void PictureLoadingThread::waitForInit()
{
QMutex mutex;
mutex.lock();
initWaitCondition.wait(&mutex);
mutex.unlock();
}
CardInfo::CardInfo(CardDatabase *_db, const QString &_name, const QString &_manacost, const QString &_cardtype, const QString &_powtough, const QString &_text, const QStringList &_colors, bool _cipt, int _tableRow, const SetList &_sets, const QMap<QString, QString> &_picURLs, const QMap<QString, QString> &_picURLsHq, const QMap<QString, QString> &_picURLsSt)
: db(_db), name(_name), sets(_sets), manacost(_manacost), cardtype(_cardtype), powtough(_powtough), text(_text), colors(_colors), picURLs(_picURLs), picURLsHq(_picURLsHq), picURLsSt(_picURLsSt), cipt(_cipt), tableRow(_tableRow), pixmap(NULL)
{
@ -427,6 +436,7 @@ CardDatabase::CardDatabase(QObject *parent)
loadingThread = new PictureLoadingThread(settingsCache->getPicsPath(), settingsCache->getPicDownload(), this);
connect(loadingThread, SIGNAL(imageLoaded(CardInfo *, QImage)), this, SLOT(imageLoaded(CardInfo *, QImage)));
loadingThread->start(QThread::LowPriority);
loadingThread->waitForInit();
noCard = new CardInfo(this);
noCard->loadPixmap(); // cache pixmap for card back