summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2016-02-06 08:10:31 +0100
committerOndrej Holy <oholy@redhat.com>2016-02-15 09:14:26 +0100
commit1f28d65fd99122a42094a08436a3884133be3c8b (patch)
treeeb7cfb96272d1ed7d7cfbaa1898b671043b39ce6
parent9c542dbf52f91746b30a871019cc161a287ae5b7 (diff)
downloadgvfs-1f28d65fd99122a42094a08436a3884133be3c8b.tar.gz
udisks2: Avoid crashes during unmount
Commit c014b64 was pushed to prevent race between unmount reply and retry timer. Result of mount operation reply should be stored if unmount operation is in progress, however it isn't, because the conditional statement is always true. Fix the condition accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=678555
-rw-r--r--monitor/udisks2/gvfsudisks2mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor/udisks2/gvfsudisks2mount.c b/monitor/udisks2/gvfsudisks2mount.c
index dced43a9..af91a38a 100644
--- a/monitor/udisks2/gvfsudisks2mount.c
+++ b/monitor/udisks2/gvfsudisks2mount.c
@@ -692,7 +692,7 @@ on_mount_op_reply (GMountOperation *mount_operation,
data->reply_result = result;
data->reply_choice = choice;
data->reply_set = TRUE;
- if (!data->completed || !data->in_progress)
+ if (!data->completed && !data->in_progress)
mount_op_reply_handle (data);
}