From 9c5876f0b4b3f217a6867d88cc73619c2c230f17 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 31 Mar 2018 23:38:53 -0400 Subject: [PATCH] fix crash when can't purchase back, fix debug info in tampering message --- src/gui/coin/Redeem.cpp | 2 +- src/gui/game/GameController.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/coin/Redeem.cpp b/src/gui/coin/Redeem.cpp index e4f7e9af9c..f85e9f4d40 100644 --- a/src/gui/coin/Redeem.cpp +++ b/src/gui/coin/Redeem.cpp @@ -34,7 +34,7 @@ class PackRedeem : public ui::ButtonAction std::string unlockPrice = format::NumberToString(price); if (numCoins < price) { - new ErrorMessage("Cannot afford pack", "This pack requires " + unlockPrice + ErrorMessage::Blocking("Cannot afford pack", "This pack requires " + unlockPrice + " \xEA""owdercoins to purchase.\n\nYou have " + format::NumberToString(numCoins) + " coins"); } else diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 2274e5d7f3..44c9e432e3 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -196,7 +196,7 @@ GameController::GameController(): if (salt != expectedSaltStr) { - gameModel->Log("Coins have been reset due to login status change or tampering, expected " + expectedSaltStr + ", got " + salt + ", current coins " + format::NumberToString(coins), false); + gameModel->Log("Coins have been reset due to login status change or tampering", false); coins = 0; } }