mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Minor changes
This commit is contained in:
parent
86e0ea15fb
commit
1e527a6942
@ -51,7 +51,7 @@ BattleWindow::BattleWindow(BattleInterface & owner):
|
||||
|
||||
REGISTER_BUILDER("battleConsole", &BattleWindow::buildBattleConsole);
|
||||
|
||||
const JsonNode config(ResourceID("config/widgets/BattleWindow2.json"));
|
||||
const JsonNode config(ResourceID("config/widgets/BattleWindow.json"));
|
||||
|
||||
addShortcut(EShortcut::GLOBAL_OPTIONS, std::bind(&BattleWindow::bOptionsf, this));
|
||||
addShortcut(EShortcut::BATTLE_SURRENDER, std::bind(&BattleWindow::bSurrenderf, this));
|
||||
|
@ -176,7 +176,7 @@ void OptionsTab::recreate()
|
||||
|
||||
if(auto turnSlider = widget<CSlider>("sliderTurnDuration"))
|
||||
{
|
||||
if(!variables["timerPresets"].isNull())
|
||||
if(turnSlider->isActive() && !variables["timerPresets"].isNull())
|
||||
{
|
||||
for(int idx = 0; idx < variables["timerPresets"].Vector().size(); ++idx)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user