Commit ec198c33 authored by Matt Lowe's avatar Matt Lowe
Browse files

Fixed shuffle issue

when closing a view we save the current settings. I added a check to
only update the shuffle settings if the zone we are closing can be
shuffled.
parent 712f12a7
......@@ -57,7 +57,7 @@ void TitleLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, bool _revealZone, bool _writeableRevealZone, const QList<const ServerInfo_Card *> &cardList)
: QGraphicsWidget(0, Qt::Tool | Qt::FramelessWindowHint), player(_player)
: QGraphicsWidget(0, Qt::Tool | Qt::FramelessWindowHint), player(_player), canBeShuffled(_origZone->getIsShufflable())
{
setAcceptHoverEvents(true);
setAttribute(Qt::WA_DeleteOnClose);
......@@ -227,7 +227,8 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
}
if (shuffleCheckBox.isChecked())
player->sendGameCommand(Command_Shuffle());
settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked());
if (canBeShuffled)
settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked());
emit closePressed(this);
deleteLater();
event->accept();
......
......@@ -48,6 +48,7 @@ private:
QCheckBox shuffleCheckBox;
QCheckBox pileViewCheckBox;
bool canBeShuffled;
int extraHeight;
Player *player;
signals:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment