From 078ebd53e12e04e43a98751b7d3ad1122c22c853 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Tue, 20 Aug 2013 12:19:15 +0200 Subject: [PATCH] Fix crash when failing to get audio CD block device CCBUG: 314544 REVIEW: 112117 --- src/panels/places/placesitem.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 5723b80a2..76b51e3aa 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -270,8 +270,13 @@ void PlacesItem::initializeDevice(const QString& udi) QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)), m_signalHandler, SLOT(onAccessibilityChanged())); } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { - const QString device = m_device.as()->device(); - setUrl(QString("audiocd:/?device=%1").arg(device)); + Solid::Block *block = m_device.as(); + if (block) { + const QString device = block->device(); + setUrl(QString("audiocd:/?device=%1").arg(device)); + } else { + setUrl(QString("audiocd:/")); + } } else if (m_mtp) { setUrl(QString("mtp:udi=%1").arg(m_device.udi())); } -- 2.47.3