From 463f4e95cff0e100b4c8c8b5378cfe1b2604c138 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 8 Sep 2019 11:49:28 +0000 Subject: fixed possible regressions git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9068 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/udisks2/udisks2plugin.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/plugins/General/udisks2/udisks2plugin.cpp') diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp index d249c06b0..65ad8ea2f 100644 --- a/src/plugins/General/udisks2/udisks2plugin.cpp +++ b/src/plugins/General/udisks2/udisks2plugin.cpp @@ -48,7 +48,7 @@ UDisks2Plugin::UDisks2Plugin(QObject *parent) : QObject(parent) m_addTracks = false; //do not load tracks on startup m_addFiles = false; //find existing devices - QList devs = m_manager->findAllDevices(); + const QList devs = m_manager->findAllDevices(); for(const QDBusObjectPath &o : qAsConst(devs)) addDevice(o); //load remaining settings @@ -65,16 +65,21 @@ UDisks2Plugin::~UDisks2Plugin() void UDisks2Plugin::removeDevice(QDBusObjectPath o) { - for(UDisks2Device *device : qAsConst(m_devices)) + QList::iterator it = m_devices.begin(); + while(it != m_devices.end()) { - if (device->objectPath() == o) + if((*it)->objectPath() == o) { - m_devices.removeAll(device); - delete device; + delete (*it); + it = m_devices.erase(it); qDebug("UDisks2Plugin: removed device: \"%s\"", qPrintable(o.path())); updateActions(); break; } + else + { + ++it; + } } } -- cgit v1.2.3-13-gbd6f