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

Some silly crash bugs fixed, and windows compile problem fixed

Browse Source
This commit is contained in:
Mark Watkins 2011-09-11 17:57:29 +10:00
parent f9bd536f54
commit 1b2508b0ec
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepLib/machine.cpp
View File

@ -617,7 +617,7 @@ bool Machine::Save()
for (int i=0;i<threads;i++) { for (int i=0;i<threads;i++) {
while (thread[i]->isRunning()) { while (thread[i]->isRunning()) {
usleep(250); SaveThread::msleep(250);
QApplication::processEvents(); QApplication::processEvents();
} }
delete thread[i]; delete thread[i];

1
SleepLib/machine.h
View File

@ -36,6 +36,7 @@ class SaveThread:public QThread
Q_OBJECT Q_OBJECT
public: public:
SaveThread(Machine *m,QString p) { machine=m; path=p; } SaveThread(Machine *m,QString p) { machine=m; path=p; }
static void msleep(unsigned long msecs) { QThread::msleep(msecs); }
virtual void run(); virtual void run();
protected: protected:
Machine *machine; Machine *machine;

5
mainwindow.cpp
View File

@ -103,9 +103,12 @@ MainWindow::MainWindow(QWidget *parent) :
pref["AppName"]="SleepyHead"; pref["AppName"]="SleepyHead";
QString Version=QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); QString Version=QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);
if (pref.Exists("VersionString") && pref["VersionString"]!=Version) { if (pref.Exists("VersionString")) {
QString V=pref["VersionString"].toString();
if (V!=Version) {
QMessageBox::warning(this,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); QMessageBox::warning(this,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok);
} }
}
pref["VersionString"]=Version; pref["VersionString"]=Version;
if (!pref.Exists("Profile")) pref["Profile"]=getUserName(); if (!pref.Exists("Profile")) pref["Profile"]=getUserName();

4
overview.cpp
View File

@ -126,7 +126,7 @@ Overview::Overview(QWidget *parent,Profile * _profile,gGraphView * shared) :
} }
Overview::~Overview() Overview::~Overview()
{ {
if (!report) { if (report) {
report->close(); report->close();
delete report; delete report;
} }
@ -168,7 +168,7 @@ void Overview::on_printButton_clicked()
{ {
if (!report) { if (!report) {
report=new Report(this,profile,m_shared,this); report=new Report(this,profile,NULL,this);
} }
if (report) { if (report) {