Fix build issue

This commit is contained in:
TuxSH 2017-06-22 00:21:48 +02:00
parent a741c92ddf
commit d5fccf001a
2 changed files with 8 additions and 3 deletions

6
.gitignore vendored
View File

@ -181,7 +181,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
@ -288,4 +288,6 @@ Makefile*
PkmGCSaveEditor_*.qm
installdir/
installdir/
PkmGCSaveEditor

View File

@ -21,6 +21,8 @@
#include <GCUIs/PokemonUI.h>
#include <QPlainTextEdit>
#include <QMessageBox>
#include <QFileInfo>
namespace GCUIs {
@ -111,6 +113,7 @@ private:
template<typename P>
void importPkmFromData(QByteArray const& ba, size_t sz = P::size) {
using namespace LibPkmGC;
P* importedPkm = NULL;
if (sz != 80)
importedPkm = new P((const u8*)ba.constData());
@ -160,4 +163,4 @@ private:
}
#endif
#endif