Skip to content

Commit 4af996f

Browse files
committed
Fix rare crash
1 parent ef61a5e commit 4af996f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/WindowManager.vala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,6 +2181,11 @@ namespace Gala {
21812181

21822182
private void switch_workspace_animation_finished (Meta.MotionDirection animation_direction,
21832183
bool cancel_action, bool is_nudge_animation = false) {
2184+
if (!animating_switch_workspace) {
2185+
return;
2186+
}
2187+
animating_switch_workspace = cancel_action;
2188+
21842189
if (switch_workspace_window_created_id > 0) {
21852190
disconnect (switch_workspace_window_created_id);
21862191
switch_workspace_window_created_id = 0;
@@ -2189,7 +2194,6 @@ namespace Gala {
21892194
if (!is_nudge_animation) {
21902195
switch_workspace_completed ();
21912196
}
2192-
animating_switch_workspace = cancel_action;
21932197

21942198
if (cancel_action) {
21952199
var cancel_direction = (animation_direction == Meta.MotionDirection.LEFT)
@@ -2272,7 +2276,8 @@ namespace Gala {
22722276
}
22732277

22742278
public override void kill_switch_workspace () {
2275-
end_switch_workspace ();
2279+
// We don't care about animation direction, we don't want to cancel it, make it nudge so that it doesn't call switch_workspace_completed ()
2280+
switch_workspace_animation_finished (LEFT, false, true);
22762281
}
22772282

22782283
public override void locate_pointer () {

0 commit comments

Comments
 (0)