krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'dteviot/Bug2285'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-03-05 20:32:34 +01:00
commit 3c190e5fa4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/activespells.cpp
View file

@ -185,7 +185,7 @@ namespace MWMechanics
bool missing = true;
for (std::vector<ActiveEffect>::const_iterator iter(addTo.begin()); iter != addTo.end(); ++iter)
{
if (effect->mEffectId == iter->mEffectId)
if ((effect->mEffectId == iter->mEffectId) && (effect->mArg == iter->mArg))
{
missing = false;
break;

1
components/contentselector/view/contentselector.cpp
View file

@ -183,6 +183,7 @@ void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool s
void ContentSelectorView::ContentSelector::slotAddonTableItemActivated(const QModelIndex &index)
{
// toggles check state when an AddOn file is double clicked or activated by keyboard
QModelIndex sourceIndex = mAddonProxyModel->mapToSource (index);
if (!mContentModel->isEnabled (sourceIndex))