Fix desktop effects on dialogs and menus

This prevents desktop effects on dialogs and menus from being used if desktop-effects is turned off. It's like already like this in the effects settings dialog.
linuxmint · Apr 26, 2016 · f26ec1f · f26ec1f
1 parent 324302a
commit f26ec1f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
@@ -509,12 +509,12 @@ WindowManager.prototype = {
             return global.settings.get_boolean("desktop-effects");
         }
         if (type == Meta.WindowType.DIALOG || type == Meta.WindowType.MODAL_DIALOG) {
-            return global.settings.get_boolean("desktop-effects-on-dialogs");
+            return global.settings.get_boolean("desktop-effects") && global.settings.get_boolean("desktop-effects-on-dialogs");
         }
         if (type == Meta.WindowType.MENU ||
             type == Meta.WindowType.DROPDOWN_MENU ||
             type == Meta.WindowType.POPUP_MENU) {
-            return global.settings.get_boolean("desktop-effects-on-menus");
+            return global.settings.get_boolean("desktop-effects") && global.settings.get_boolean("desktop-effects-on-menus");
         }
         return false;
     },