Skip to content

Commit b908d1c

Browse files
committed
windowManager: Fix a missing default case, return early when
individual effects are disabled, not just when they all are. Fixes #10977
1 parent d0b2654 commit b908d1c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

js/ui/windowManager.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ var WindowManager = class WindowManager {
382382
_minimizeWindow(cinnamonwm, actor) {
383383
Main.soundManager.play('minimize');
384384

385-
if (!this._shouldAnimate(actor)) {
385+
if (!this._shouldAnimate(actor) || this.desktop_effects_minimize_type == "none") {
386386
cinnamonwm.completed_minimize(actor);
387387
return;
388388
}
@@ -476,7 +476,7 @@ var WindowManager = class WindowManager {
476476
_unminimizeWindow(cinnamonwm, actor) {
477477
Main.soundManager.play('minimize');
478478

479-
if (!this._shouldAnimate(actor)) {
479+
if (!this._shouldAnimate(actor) || this.desktop_effects_map_type == "none") {
480480
cinnamonwm.completed_unminimize(actor);
481481
return;
482482
}
@@ -812,7 +812,7 @@ var WindowManager = class WindowManager {
812812
this._checkDimming(actor.get_meta_window().get_transient_for());
813813
}
814814

815-
if (!this._shouldAnimate(actor)) {
815+
if (!this._shouldAnimate(actor) || this.desktop_effects_map_type == "none") {
816816
cinnamonwm.completed_map(actor);
817817
return;
818818
}
@@ -946,7 +946,7 @@ var WindowManager = class WindowManager {
946946
Meta.WindowType.DIALOG,
947947
Meta.WindowType.MODAL_DIALOG];
948948

949-
if (!this._shouldAnimate(actor, types)) {
949+
if (!this._shouldAnimate(actor, types) || this.desktop_effects_close_type === "none") {
950950
cinnamonwm.completed_destroy(actor);
951951
return;
952952
}
@@ -1015,10 +1015,14 @@ var WindowManager = class WindowManager {
10151015
// ??
10161016
default:
10171017
{
1018-
this._destroyWindowDone();
1018+
this._destroyWindowDone(cinnamonwm, actor);
10191019
}
10201020
}
10211021
}
1022+
default:
1023+
{
1024+
this._destroyWindowDone(cinnamonwm, actor);
1025+
}
10221026
}
10231027
}
10241028

0 commit comments

Comments
 (0)