Skip to content

Commit

Permalink
Fix some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Renaud G committed Dec 15, 2019
1 parent b391cf8 commit 49ff59a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions client/services/updatechecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ UpdateChecker::UpdateChecker(QObject* obj)
#ifdef VERSION_MINOR
#ifdef VERSION_MAJOR
#ifdef VERSION_MIDDLE
m_versionMinor = VERSION_MINOR;
m_versionMajor = VERSION_MAJOR;
m_versionMinor= VERSION_MINOR;
m_versionMajor= VERSION_MAJOR;
m_versionMiddle= VERSION_MIDDLE;
#endif
#endif
Expand Down Expand Up @@ -121,7 +121,7 @@ void UpdateChecker::readXML(QNetworkReply* p)
{
m_versionChangelog= changelog.capturedTexts().at(1);
}
m_state = inferiorVersion();
m_state= inferiorVersion();
m_version= QString("%1.%2.%3").arg(m_versionMajor).arg(m_versionMiddle).arg(m_versionMinor);
emit checkFinished();
m_manager->deleteLater();
Expand Down
2 changes: 2 additions & 0 deletions client/vmap/items/imageitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ void ImageItem::readData(QDataStream& in)
in >> p;
setPos(p);

m_initialized= false;

dataToMedia();
}
void ImageItem::fillMessage(NetworkMessageWriter* msg)
Expand Down
2 changes: 1 addition & 1 deletion client/vmap/vmap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,8 @@ void VMap::openFile(QDataStream& in)
in >> x;
in >> y;
addNewItem(new AddVmapItemCommand(item, false, this), false);
item->setPos(x, y);
item->initChildPointItem();
item->setPos(x, y);
if(nullptr != charItem)
{
insertCharacterInMap(charItem);
Expand Down

0 comments on commit 49ff59a

Please sign in to comment.