Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solve deadlock in startup between ErrorLogModel and AudioManager

This commit is contained in:
Bart De Vries 2021-07-06 17:01:48 +02:00
parent 6a4c6011d1
commit 9731795e62
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/audiomanager.cpp
View File

@ -17,6 +17,7 @@
#include "audiologging.h" #include "audiologging.h"
#include "datamanager.h" #include "datamanager.h"
#include "errorlogmodel.h"
#include "feed.h" #include "feed.h"
#include "powermanagementinterface.h" #include "powermanagementinterface.h"
#include "settingsmanager.h" #include "settingsmanager.h"
@ -73,6 +74,8 @@ AudioManager::AudioManager(QObject *parent)
connect(&DataManager::instance(), &DataManager::queueEntryRemoved, this, &AudioManager::canGoNextChanged); connect(&DataManager::instance(), &DataManager::queueEntryRemoved, this, &AudioManager::canGoNextChanged);
// we'll send custom seekableChanged signal to work around QMediaPlayer glitches // we'll send custom seekableChanged signal to work around QMediaPlayer glitches
connect(this, &AudioManager::logError, &ErrorLogModel::instance(), &ErrorLogModel::monitorErrorMessages);
// Check if an entry was playing when the program was shut down and restore it // Check if an entry was playing when the program was shut down and restore it
if (DataManager::instance().lastPlayingEntry() != QStringLiteral("none")) { if (DataManager::instance().lastPlayingEntry() != QStringLiteral("none")) {
setEntry(DataManager::instance().getEntry(DataManager::instance().lastPlayingEntry())); setEntry(DataManager::instance().getEntry(DataManager::instance().lastPlayingEntry()));

2
src/errorlogmodel.cpp
View File

@ -8,7 +8,6 @@
#include <QSqlQuery> #include <QSqlQuery>
#include "audiomanager.h"
#include "database.h" #include "database.h"
#include "datamanager.h" #include "datamanager.h"
#include "fetcher.h" #include "fetcher.h"
@ -17,7 +16,6 @@ ErrorLogModel::ErrorLogModel()
: QAbstractListModel(nullptr) : QAbstractListModel(nullptr)
{ {
connect(&Fetcher::instance(), &Fetcher::error, this, &ErrorLogModel::monitorErrorMessages); connect(&Fetcher::instance(), &Fetcher::error, this, &ErrorLogModel::monitorErrorMessages);
connect(&AudioManager::instance(), &AudioManager::logError, this, &ErrorLogModel::monitorErrorMessages);
QSqlQuery query; QSqlQuery query;
query.prepare(QStringLiteral("SELECT * FROM Errors ORDER BY date DESC;")); query.prepare(QStringLiteral("SELECT * FROM Errors ORDER BY date DESC;"));