mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-16 10:19:47 +02:00
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
b0933a1ff0
@ -102,13 +102,12 @@ void CSelectionBase::toggleTab(std::shared_ptr<CIntObject> tab)
|
|||||||
{
|
{
|
||||||
if(curTab && curTab->isActive())
|
if(curTab && curTab->isActive())
|
||||||
{
|
{
|
||||||
curTab->deactivate();
|
curTab->disable();
|
||||||
curTab->recActions = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(curTab != tab)
|
if(curTab != tab)
|
||||||
{
|
{
|
||||||
tab->activate();
|
tab->enable();
|
||||||
curTab = tab;
|
curTab = tab;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user