diff options
| author |  Fabio Bas | 2009-01-04 15:03:03 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-01-04 15:03:03 +0000 |
| commit | f8a8c24c0d95d7b61c6adbe22d663a948d47ff91 (patch) | |
| tree | f834b41500328a5c531bd0abc523021063b2c7a4 /src/modules | |
| parent | updated german translation (diff) | |
| download | KVIrc-f8a8c24c0d95d7b61c6adbe22d663a948d47ff91.tar.gz KVIrc-f8a8c24c0d95d7b61c6adbe22d663a948d47ff91.tar.bz2 KVIrc-f8a8c24c0d95d7b61c6adbe22d663a948d47ff91.zip | |
probable fix for #335
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2972 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mediaplayer/libkvimediaplayer.cpp | 4 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.cpp | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index ae8a4f6be..e0deb7355 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1448,8 +1448,8 @@ MP_KVS_FUNCTION(amipEval) MP_KVS_FUNCTION(status) { - KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETERS_END(c) +// KVSM_PARAMETERS_BEGIN(c) +// KVSM_PARAMETERS_END(c) MP_KVS_FAIL_ON_NO_INTERFACE KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status(); diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index 3ad8e0ced..53a6dbba5 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -131,7 +131,13 @@ KviMediaPlayerInterface::PlayerStatus KviMPRISInterface::status() if (!dbus_iface.isValid()) return KviMediaPlayerInterface::Unknown; - QDBusReply<MPRISPlayerStatus> reply = dbus_iface.call(QDBus::Block, "GetStatus"); + QDBusMessage msg = dbus_iface.call(QDBus::Block, "GetStatus"); + + + if(msg.type() != QDBusMessage::ReplyMessage) + return KviMediaPlayerInterface::Unknown; + + QDBusReply<MPRISPlayerStatus> reply = msg; if (!reply.isValid()) return KviMediaPlayerInterface::Unknown; |