aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server deck hash fix

Browse source
This commit is contained in:
unknown 2011-10-04 17:17:49 +02:00
parent 0bb4ef8bb8
commit 3ea81dfe2b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/decklist.cpp
View file

@ -96,7 +96,7 @@ void InnerDecklistNode::clearTree()
} }
DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent) DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent)
: AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()) : AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()), price(other->getPrice())
{ {
} }
@ -357,6 +357,7 @@ void DeckList::loadFromXml(QXmlStreamReader *xml)
} }
} }
} }
updateDeckHash();
} }
bool DeckList::loadFromFile_Native(QIODevice *device) bool DeckList::loadFromFile_Native(QIODevice *device)
@ -415,6 +416,7 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
++okRows; ++okRows;
new DecklistCardNode(line.mid(i + 1), number, zone); new DecklistCardNode(line.mid(i + 1), number, zone);
} }
updateDeckHash();
return (okRows > 0); return (okRows > 0);
} }
@ -455,10 +457,8 @@ bool DeckList::loadFromFile(const QString &fileName, FileFormat fmt)
case PlainTextFormat: result = loadFromFile_Plain(&file); break; case PlainTextFormat: result = loadFromFile_Plain(&file); break;
case CockatriceFormat: result = loadFromFile_Native(&file); break; case CockatriceFormat: result = loadFromFile_Native(&file); break;
} }
if (result) { if (result)
updateDeckHash();
emit deckLoaded(); emit deckLoaded();
}
return result; return result;
} }

2
servatrice/src/servatrice.cpp
View file

@ -424,4 +424,4 @@ void Servatrice::shutdownTimeout()
deleteLater(); deleteLater();
} }
const QString Servatrice::versionString = "Servatrice 0.20110921"; const QString Servatrice::versionString = "Servatrice 0.20111004";