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

More on that last commit

Browse Source
This commit is contained in:
Mark Watkins 2014-09-17 22:03:06 +10:00
parent 959e5e5d13
commit a5b28c1fdc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/SleepLib/machine.cpp
View File

@ -335,6 +335,8 @@ bool Machine::unlinkDay(Day * d)
bool Machine::unlinkSession(Session * sess) bool Machine::unlinkSession(Session * sess)
{ {
MachineType mt = sess->type();
// Remove the object from the machine object's session list // Remove the object from the machine object's session list
bool b=sessionlist.remove(sess->session()); bool b=sessionlist.remove(sess->session());
@ -358,6 +360,10 @@ bool Machine::unlinkSession(Session * sess)
d = days.at(i); d = days.at(i);
if (d->sessions.removeAll(sess)) { if (d->sessions.removeAll(sess)) {
b=true; b=true;
if (!d->searchMachine(mt)) {
d->machines.remove(mt);
}
if (d->size() == 0) { if (d->size() == 0) {
day.remove(dates[i]); day.remove(dates[i]);
p_profile->unlinkDay(d); p_profile->unlinkDay(d);

4
sleepyhead/preferencesdialog.ui
View File

@ -9,7 +9,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>809</width> <width>824</width>
<height>610</height> <height>610</height>
</rect> </rect>
</property> </property>
@ -51,7 +51,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>6</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">