dash-to-dock: Handle missing main dock when restoring dash

Resolves: RHEL-16723
This commit is contained in:
Florian Müllner 2023-12-14 14:54:41 +01:00
parent 7ce6ca2ac5
commit 82fefc56e4
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 3edf3c0be7638bf9161c0d192dd3c2de1e3b9845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 14 Dec 2023 14:41:04 +0100
Subject: [PATCH] docking: Only remove spacer if necessary
There may not be a main dock at the time when restoring the dash.
Handle that case by not removing a non-existent spacer, instead of
triggering an error.
---
extensions/dash-to-dock/docking.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/dash-to-dock/docking.js b/extensions/dash-to-dock/docking.js
index daa9de59..14e2ced6 100644
--- a/extensions/dash-to-dock/docking.js
+++ b/extensions/dash-to-dock/docking.js
@@ -1796,7 +1796,7 @@ var DockManager = class DashToDock_DockManager {
let overviewControls = Main.overview._overview._controls;
Main.overview._overview._controls.layout_manager._dash = this._oldDash;
- if (this.mainDock._dashSpacer) {
+ if (this.mainDock?._dashSpacer) {
Main.overview._overview._controls.remove_child(this.mainDock._dashSpacer);
}
--
2.43.0

View File

@ -7,7 +7,7 @@
Name: gnome-shell-extensions
Version: 40.7
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Modify and extend GNOME Shell functionality and behavior
License: GPLv2+
@ -41,6 +41,7 @@ Patch018: 0001-gesture-inhibitor-Allow-inhibiting-workspace-switch-.patch
Patch019: 0001-desktop-icons-Don-t-use-blocking-IO.patch
Patch020: 0001-window-list-Explicitly-dispose-settings-on-destroy.patch
Patch021: 0001-desktop-icons-Don-t-try-spawn-with-non-existent-work.patch
Patch022: 0001-docking-Only-remove-spacer-if-necessary.patch
%description
GNOME Shell Extensions is a collection of extensions providing additional and
@ -444,6 +445,10 @@ workspaces.
%changelog
* Thu Dec 14 2023 Florian Müllner <fmuellner@redhat.com> - 40.7-11
- Handle missing main dock when restoring dash
Resolves: RHEL-16723
* Tue Nov 07 2023 Florian Müllner <fmuellner@redhat.com> - 40.7-10
- Include dash-to-panel extension
Resolves: RHEL-14935