Commit fa657b97 authored by Michael Pyne's avatar Michael Pyne

mpris2: Move DBus adapter creation until after GUI setup.

This helps a little bit with JuK freezing Plasma due to DBus deadlocks
from synchronous calls being made between KStatusNotifierItem, its
Plasma notification area counterpart, and the MPRIS2 adapter and its
Plasma counterpart(s).

Proper fix is async everywhere as far as I can tell.
parent d2dcd686
......@@ -57,7 +57,6 @@
#include "collectionlist.h"
#include "covermanager.h"
#include "tagtransactionmanager.h"
#include "mpris2/mpris2.h"
using namespace ActionCollection;
......@@ -126,8 +125,6 @@ JuK::JuK(QWidget *parent) :
readConfig();
setupGlobalAccels();
(void) new Mpris2(this);
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(slotAboutToQuit()));
// slotCheckCache loads the cached entries first to populate the collection list
......
......@@ -43,6 +43,7 @@
#include "nowplaying.h"
#include "playlistbox.h"
#include "lyricswidget.h"
#include "mpris2/mpris2.h"
////////////////////////////////////////////////////////////////////////////////
// public methods
......@@ -328,6 +329,8 @@ void PlaylistSplitter::slotEnable()
setEnabled(true); // Ready to go.
m_playlistStack->show();
kDebug() << "Finished enabling GUI, took" << stopwatch.elapsed() << "ms";
(void) new Mpris2(this);
}
#include "playlistsplitter.moc"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment