FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #117.

Browse Source
This commit is contained in:
Martin Rotter 2015-07-26 18:44:00 +02:00
parent be51f0c3c1
commit 73ff85418e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/text/CHANGELOG
View File

@ -22,6 +22,7 @@
</ul> </ul>
Fixed: Fixed:
<ul> <ul>
<li>Auto-updating fixed, error was due to master mutex double locking. (issue #117)</li>
<li>Fixed some memory leaks which might appear when adding/editing categories/feeds.</li> <li>Fixed some memory leaks which might appear when adding/editing categories/feeds.</li>
<ul> <ul>
<hr/> <hr/>

14
src/gui/feedsview.cpp
View File

@ -208,18 +208,20 @@ void FeedsView::executeNextAutoUpdate() {
// Pass needed interval data and lets the model decide which feeds // Pass needed interval data and lets the model decide which feeds
// should be updated in this pass. // should be updated in this pass.
QList<Feed*> feeds_for_update = m_sourceModel->feedsForScheduledUpdate(m_globalAutoUpdateEnabled && QList<Feed*> feeds_for_update = m_sourceModel->feedsForScheduledUpdate(m_globalAutoUpdateEnabled &&
m_globalAutoUpdateRemainingInterval == 0); m_globalAutoUpdateRemainingInterval == 0);
if (feeds_for_update.isEmpty()) { // No feeds are scheduled for update now, unlock the master lock.
// No feeds are scheduled for update now, unlock the master lock. qApp->feedUpdateLock()->unlock();
qApp->feedUpdateLock()->unlock();
} if (!feeds_for_update.isEmpty()) {
else {
// Request update for given feeds. // Request update for given feeds.
emit feedsUpdateRequested(feeds_for_update); emit feedsUpdateRequested(feeds_for_update);
// NOTE: OSD/bubble informing about performing // NOTE: OSD/bubble informing about performing
// of scheduled update can be shown now. // of scheduled update can be shown now.
qApp->showGuiMessage(tr("Startin auto-update of some feeds"),
tr("I will auto-update %n feed(s).", 0, feeds_for_update.size()),
QSystemTrayIcon::Information);
} }
} }