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:18:32 +0100
commit12f104b037312be771983ad7eb67f34e841a0bdd (patch)
tree492b4e6b3d690b86e45f88d5ee91ba13ab9559b2
parentea78c2bf2fdd357d69c50a66eb664cde76beb1b6 (diff)
downloadgvfs-12f104b037312be771983ad7eb67f34e841a0bdd.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);
}