oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

storage/udisks2: use existing mount point if already mounted

Browse Source 
Fixes the "org.freedesktop.UDisks2.Error.AlreadyMounted" error.

Closes #485
This commit is contained in:
Max Kellermann 2019-02-20 22:03:11 +01:00
parent 0a3aee9d82
commit bbaeea1ab7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/plugins/UdisksStorage.cxx
View File

@ -156,16 +156,27 @@ UdisksStorage::OnListReply(ODBus::Message reply) noexcept
using namespace UDisks2;
try {
ParseObjects(reply, [this](Object &&o) {
std::string mount_point;
ParseObjects(reply, [this, &mount_point](Object &&o) {
if (!o.IsId(id))
return;
dbus_path = std::move(o.path);
mount_point = std::move(o.mount_point);
});
if (dbus_path.empty())
throw FormatRuntimeError("No such UDisks2 object: %s",
id.c_str());
if (!mount_point.empty()) {
/* already mounted: don't attempt to mount
again, because this would result in
org.freedesktop.UDisks2.Error.AlreadyMounted */
LockSetMountPoint(mount_point.c_str());
return;
}
} catch (...) {
const std::lock_guard<Mutex> lock(mutex);
mount_error = std::current_exception();