latest changes from gta5sync

This commit is contained in:
Syping 2017-06-05 18:16:17 +02:00
parent ed559f3ce9
commit e0d90ff7d0
19 changed files with 1179 additions and 823 deletions

View file

@ -502,7 +502,7 @@ bool ProfileInterface::importFile(QString selectedFile, bool notMultiple, int cu
if (selectedFileName.left(4) == "PGTA" || selectedFileName.right(4) == ".g5e")
{
SnapmaticPicture *picture = new SnapmaticPicture(selectedFile);
if (picture->readingPicture())
if (picture->readingPicture(true, true, true))
{
bool success = importSnapmaticPicture(picture, notMultiple);
if (!success) delete picture;
@ -534,7 +534,7 @@ bool ProfileInterface::importFile(QString selectedFile, bool notMultiple, int cu
else if(selectedFileName.right(4) == ".jpg" || selectedFileName.right(4) == ".png")
{
SnapmaticPicture *picture = new SnapmaticPicture(":/template/template.g5e");
if (picture->readingPicture(true, false))
if (picture->readingPicture(true, false, true, false))
{
if (!notMultiple)
{