diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 869abecb2..0c69fb4df 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1341,19 +1341,19 @@ void Player::actMoveTopCardsUntil() { stopMoveTopCardsUntil(); - DlgMoveTopCardsUntil dlg(game, previousMovingCardsUntilExpr, previousMovingCardsUntilNumberOfHits); + DlgMoveTopCardsUntil dlg(game, movingCardsUntilExpr, movingCardsUntilNumberOfHits); if (!dlg.exec()) { return; } - previousMovingCardsUntilExpr = dlg.getExpr(); - previousMovingCardsUntilNumberOfHits = dlg.getNumberOfHits(); + movingCardsUntilExpr = dlg.getExpr(); + movingCardsUntilNumberOfHits = dlg.getNumberOfHits(); if (zones.value("deck")->getCards().empty()) { stopMoveTopCardsUntil(); } else { - movingCardsUntilFilter = FilterString(previousMovingCardsUntilExpr); - movingCardsUntilCounter = previousMovingCardsUntilNumberOfHits; + movingCardsUntilFilter = FilterString(movingCardsUntilExpr); + movingCardsUntilCounter = movingCardsUntilNumberOfHits; movingCardsUntil = true; actMoveTopCardToPlay(); } diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 484e509d7..3c9e9a303 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -268,8 +268,8 @@ private: bool movingCardsUntil; QTimer *moveTopCardTimer; - QString previousMovingCardsUntilExpr = {}; - int previousMovingCardsUntilNumberOfHits = 1; + QString movingCardsUntilExpr = {}; + int movingCardsUntilNumberOfHits = 1; FilterString movingCardsUntilFilter; int movingCardsUntilCounter = 0; void stopMoveTopCardsUntil();