From 0e3795b2f32ab7fa6694b2aece45a8f43902cc5f Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 19 Jun 2012 15:08:45 -0400 Subject: [PATCH] autorun: change logic for ignoring volumes Previously, a volume was being ignored from autorun if one of these two conditions were met: - its mount root file had a native scheme and was mounted in a non-hidden location - it had a volume that could have been automounted, and had a flag set by the shell to allow autorun In order to effectively ignore volumes that we don't mount ourselves from our notification system, we have to meet both conditions at the same time instead. https://bugzilla.gnome.org/show_bug.cgi?id=660595 --- js/ui/autorunManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js index 9fbb26e53..9d39690e9 100644 --- a/js/ui/autorunManager.js +++ b/js/ui/autorunManager.js @@ -27,7 +27,7 @@ function ignoreAutorunForMount(mount) { let root = mount.get_root(); let volume = mount.get_volume(); - if ((root.is_native() && !isMountRootHidden(root)) || + if ((root.is_native() && !isMountRootHidden(root)) && (volume && volume.allowAutorun && volume.should_automount())) return false;