Skip to content

Guard against updates after destroy #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pappmann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Guard against updates after destroy #577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const ClipboardIndicator = GObject.registerClass({
#refreshInProgress = false;

destroy () {
this._destroyed = true;
this._disconnectSettings();
this._unbindShortcuts();
this._disconnectSelectionListener();
Expand All @@ -87,6 +88,7 @@ const ClipboardIndicator = GObject.registerClass({
_init (extension) {
super._init(0.0, "ClipboardIndicator");
this.extension = extension;
this._destroyed = false;
this.registry = new Registry(extension);
this.keyboard = new Keyboard();
this._settingsChangedId = null;
Expand Down Expand Up @@ -131,6 +133,9 @@ const ClipboardIndicator = GObject.registerClass({

this.dialogManager = new DialogManager();
this._buildMenu().then(() => {
if (this._destroyed) {
return;
}
this._updateTopbarLayout();
this._setupListener();
this._setupHistoryIntervalClearing();
Expand Down Expand Up @@ -169,6 +174,9 @@ const ClipboardIndicator = GObject.registerClass({
async _buildMenu () {
let that = this;
const clipHistory = await this._getCache();
if (this._destroyed) {
return;
}
let lastIdx = clipHistory.length - 1;
let clipItemsArr = that.clipItemsRadioGroup;

Expand Down Expand Up @@ -350,6 +358,9 @@ const ClipboardIndicator = GObject.registerClass({
}

#hideElements() {
if (this._destroyed) {
return;
}
if (this.menu.box.contains(this._entryItem)) this.menu.box.remove_child(this._entryItem);
if (this.menu.box.contains(this.favoritesSeparator)) this.menu.box.remove_child(this.favoritesSeparator);
if (this.menu.box.contains(this.historySeparator)) this.menu.box.remove_child(this.historySeparator);
Expand All @@ -358,6 +369,9 @@ const ClipboardIndicator = GObject.registerClass({
}

#showElements() {
if (this._destroyed) {
return;
}
if (this.clipItemsRadioGroup.length > 0) {
if (this.menu.box.contains(this._entryItem) === false) {
this.menu.box.insert_child_at_index(this._entryItem, 0);
Expand Down Expand Up @@ -393,6 +407,9 @@ const ClipboardIndicator = GObject.registerClass({
}

#renderEmptyState () {
if (this._destroyed) {
return;
}
this.#hideElements();
this.menu.box.insert_child_at_index(this.emptyStateSection, 0);
}
Expand Down Expand Up @@ -767,7 +784,7 @@ const ClipboardIndicator = GObject.registerClass({
}

async _refreshIndicator () {
if (PRIVATEMODE) return; // Private mode, do not.
if (PRIVATEMODE || this._destroyed) return; // Private mode, do not.

const focussedWindow = Shell.Global.get().display.focusWindow;
const wmClass = focussedWindow?.get_wm_class();
Expand All @@ -779,6 +796,9 @@ const ClipboardIndicator = GObject.registerClass({

try {
const result = await this.#getClipboardContent();
if (this._destroyed) {
return;
}

if (result) {
for (let menuItem of this.clipItemsRadioGroup) {
Expand Down