Fix crash on size change (non-)transitions

This commit is contained in:
Florian Müllner 2020-10-13 12:57:37 +02:00
parent 72619c8a82
commit 6d3edac2fe
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 6ba3ca5f9548ba0a87a9e3ffa129716d0a062e1e Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 2 Oct 2020 16:33:31 +0800
Subject: [PATCH] windowManager: Avoid calling meta_window_actor_thaw when not
frozen
Because that tends to crash in:
```
g_error ("Error in freeze/thaw accounting");
```
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1431
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1453
---
js/ui/windowManager.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index ab86a2e6a3..91b764ea8d 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1378,6 +1378,10 @@ var WindowManager = class {
onStopped: () => this._sizeChangeWindowDone(shellwm, actor),
});
+ // ease didn't animate and cleared the info, we are done
+ if (!actor.__animationInfo)
+ return;
+
// Now unfreeze actor updates, to get it to the new size.
// It's important that we don't wait until the animation is completed to
// do this, otherwise our scale will be applied to the old texture size.
--
2.28.0

View File

@ -1,6 +1,6 @@
Name: gnome-shell Name: gnome-shell
Version: 3.38.1 Version: 3.38.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
License: GPLv2+ License: GPLv2+
@ -10,6 +10,7 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list # Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch Patch1: gnome-shell-favourite-apps-firefox.patch
Patch2: 0001-windowManager-Avoid-calling-meta_window_actor_thaw-w.patch
%define eds_version 3.33.1 %define eds_version 3.33.1
%define gnome_desktop_version 3.35.91 %define gnome_desktop_version 3.35.91
@ -217,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1* %{_mandir}/man1/gnome-shell.1*
%changelog %changelog
* Tue Oct 13 2020 Florian Müllner <fmuellner@redhat.com> - 3.38.1-2
- Fix crash on size change (non-)transitions
* Mon Oct 05 2020 Florian Müllner <fmuellner@redhat.com> - 3.38.1-1 * Mon Oct 05 2020 Florian Müllner <fmuellner@redhat.com> - 3.38.1-1
- Update to 3.38.1 - Update to 3.38.1