chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unbreaking git.. I ctrl-z'd something by accident before the previous push..

Browse Source
This commit is contained in:
Mark Watkins 2012-01-05 15:12:09 +10:00
parent edc8c1f265
commit f1792b188c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SleepLib/session.cpp
View File

@ -451,8 +451,8 @@ bool Session::StoreEvents(QString filename)
} }
bool Session::LoadEvents(QString filename) bool Session::LoadEvents(QString filename)
{ {
quint32 t32,magicnum,machid,sessid; quint32 magicnum,machid,sessid;
quint16 t16,version,type,crc16,machtype,compmethod; quint16 version,type,crc16,machtype,compmethod;
quint8 t8; quint8 t8;
qint32 datasize; qint32 datasize;
@ -473,7 +473,6 @@ bool Session::LoadEvents(QString filename)
header.setVersion(QDataStream::Qt_4_6); header.setVersion(QDataStream::Qt_4_6);
header.setByteOrder(QDataStream::LittleEndian); header.setByteOrder(QDataStream::LittleEndian);
bool compressed=true;
header >> magicnum; // Magic Number (quint32) header >> magicnum; // Magic Number (quint32)
header >> version; // Version (quint16) header >> version; // Version (quint16)
header >> type; // File type (quint16) header >> type; // File type (quint16)
@ -515,7 +514,7 @@ bool Session::LoadEvents(QString filename)
} else { } else {
databytes=temp; databytes=temp;
} }
} } else databytes=temp;
if (version>=10) { if (version>=10) {
if (databytes.size()!=datasize) { if (databytes.size()!=datasize) {
@ -629,8 +628,6 @@ bool Session::LoadEvents(QString filename)
} }
} }
zzzzz; deliberately breaking git..
if (version<events_version) { if (version<events_version) {
qDebug() << "Upgrading Events file" << filename << "to version" << events_version; qDebug() << "Upgrading Events file" << filename << "to version" << events_version;
UpdateSummaries(); UpdateSummaries();