Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions src/app_model/backends/qt/_qmenu.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def __init__(
self.setObjectName(menu_id)
self.rebuild()
self._app.menus.menus_changed.connect(self._on_registry_changed)
self.destroyed.connect(self._disconnect)
# ----------------------

if title is not None:
Expand Down Expand Up @@ -98,9 +97,6 @@ def _on_about_to_show(self) -> None:
if isinstance(action, QCommandRuleAction):
action._refresh()

def _disconnect(self) -> None:
self._app.menus.menus_changed.disconnect(self._on_registry_changed)

def _on_registry_changed(self, changed_ids: set[str]) -> None:
if self._menu_id in changed_ids:
# if this (sub)menu has been removed from the registry,
Expand Down Expand Up @@ -202,7 +198,6 @@ def __init__(
self.setObjectName(menu_id)
self.rebuild()
self._app.menus.menus_changed.connect(self._on_registry_changed)
self.destroyed.connect(self._disconnect)
# ----------------------

if title is not None:
Expand Down Expand Up @@ -249,12 +244,12 @@ def rebuild(
exclude=self._exclude if exclude is None else exclude,
)

def _disconnect(self) -> None:
self._app.menus.menus_changed.disconnect(self._on_registry_changed)

def _on_registry_changed(self, changed_ids: set[str]) -> None:
if self._menu_id in changed_ids:
self.rebuild()
# the C++ object may already be deleted while the python wrapper
# (and therefore this weakly-connected slot) is still alive.
with contextlib.suppress(RuntimeError):
self.rebuild()


class QModelMenuBar(QMenuBar):
Expand Down
28 changes: 26 additions & 2 deletions tests/test_qt/test_qmenu.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
from __future__ import annotations

import gc
import sys
from typing import TYPE_CHECKING, cast

import pytest
from qtpy.QtCore import Qt
from qtpy.QtCore import QEvent, Qt
from qtpy.QtWidgets import QAction, QMainWindow

from app_model.backends.qt import QModelMenu, QModelToolBar

if TYPE_CHECKING:
from pytestqt.plugin import QtBot
from qtpy.QtWidgets import QApplication

from conftest import FullApp

Expand Down Expand Up @@ -64,7 +66,29 @@ def test_menu(
with pytest.raises(NameError, match="Names required to eval this expression"):
menu.update_from_context({})

menu._disconnect()

@pytest.mark.parametrize("MenuCls", [QModelMenu, QModelToolBar])
def test_menu_cpp_deleted(
MenuCls: type[QModelMenu] | type[QModelToolBar],
qapp: QApplication,
full_app: FullApp,
) -> None:
"""Registry changes are safe after the C++ object is deleted (#157)."""
app = full_app
signal = app.menus.menus_changed
n_slots = len(signal)
menu = MenuCls(app.Menus.EDIT, app)
assert len(signal) == n_slots + 1

menu.deleteLater()
qapp.sendPostedEvents(None, QEvent.Type.DeferredDelete)
# python wrapper is still alive, so the slot is still connected
signal.emit({app.Menus.EDIT})

# once the wrapper is gone, the (weak) connection cleans itself up
del menu
gc.collect()
assert len(signal) == n_slots


def test_submenu(qtbot: QtBot, full_app: FullApp) -> None:
Expand Down
Loading