summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorAlexandru Pandelea <[email protected]>2016-11-25 16:50:16 +0200
committerlukefromdc <[email protected]>2018-11-02 00:01:17 -0400
commitbc0b2cbb27478a5c31d6f0db376385e70caaddbb (patch)
treef67f377e8c431d56047dce9c731125dc443b4b54 /src/file-manager
parent8fff655552209fd181f9608d02d0f72660b10768 (diff)
downloadcaja-bc0b2cbb27478a5c31d6f0db376385e70caaddbb.tar.bz2
caja-bc0b2cbb27478a5c31d6f0db376385e70caaddbb.tar.xz
properties-window: fix checking inconsistent state
In the function initial_permission_state_consistent, when the check was made to see if the files have the same permissions, the check was not correct. To fix this, also do & between the first_permissions and the mask. https://bugzilla.gnome.org/show_bug.cgi?id=698955 Adapted from https://gitlab.gnome.org/GNOME/nautilus/commit/37595852
Diffstat (limited to 'src/file-manager')
-rw-r--r--src/file-manager/fm-properties-window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 885d9f56..970e7520 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -3611,7 +3611,7 @@ initial_permission_state_consistent (FMPropertiesWindow *window,
first_permissions = permissions;
first = FALSE;
- } else if ((permissions & mask) != first_permissions) {
+ } else if ((permissions & mask) != (first_permissions & mask)) {
/* Not same permissions as first -> inconsistent */
return FALSE;
}