Merge pull request #826 from kevlahnota/master

fix crash when copying tokens
2016-08-04 00:41:31 +08:00
parent fc350be3a1 9371125eb0
commit a0bbed6c6c
1 changed files with 2 additions and 2 deletions
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -1462,8 +1462,8 @@ int AACopier::resolve()
    if (_target)
    {
        MTGCard* clone ;
-        if((_target->isToken || _target->isACopier) && _target->hasCopiedToken)
-        {
+        if(_target->isToken || (_target->isACopier && _target->hasCopiedToken))
+        {//fix crash when copying token
            clone = _target;
            tokencopied = true;
        }