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

Fix small Notes glitch when deleting note data

Browse Source
This commit is contained in:
Mark Watkins 2011-12-02 21:48:02 +10:00
parent 4d5d09b5f0
commit fbe75a63b3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daily.cpp
View File

@ -848,7 +848,7 @@ void Daily::Unload(QDate date)
bool ok; bool ok;
if (journal) { if (journal) {
QString jhtml=ui->JournalNotes->toHtml(); QString jhtml=ui->JournalNotes->toHtml();
if ((!journal->settings.contains(Journal_Notes) && !nonotes) || (!nonotes && (journal->settings[Journal_Notes]!=jhtml))) { if ((!journal->settings.contains(Journal_Notes) && !nonotes) || (journal->settings[Journal_Notes]!=jhtml)) {
journal->settings[Journal_Notes]=jhtml; journal->settings[Journal_Notes]=jhtml;
journal->SetChanged(true); journal->SetChanged(true);
} }
@ -910,6 +910,12 @@ void Daily::Unload(QDate date)
} }
if (journal) { if (journal) {
if (nonotes) {
QHash<ChannelID,QVariant>::iterator it=journal->settings.find(Journal_Notes);
if (it!=journal->settings.end()) {
journal->settings.erase(it);
}
}
Machine *jm=PROFILE.GetMachine(MT_JOURNAL); Machine *jm=PROFILE.GetMachine(MT_JOURNAL);
if (jm) jm->SaveSession(journal); if (jm) jm->SaveSession(journal);
} }