Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1401536 [wrapped C/C++ object of type QAction has been deleted (on device unmount)](https://bugs.launchpad.net/calibre/+bug/1401536)

Browse Source
This commit is contained in:
Kovid Goyal 2014-12-13 16:26:46 +05:30
parent 6320ea10a0
commit cfbf573c1b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/dbus_export/menu.py
View File

@ -9,7 +9,7 @@ __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
# Support for excporting Qt's MenuBars/Menus over DBUS. The API is defined in # Support for excporting Qt's MenuBars/Menus over DBUS. The API is defined in
# dbus-menu.xml from the libdbusmenu project https://launchpad.net/libdbusmenu # dbus-menu.xml from the libdbusmenu project https://launchpad.net/libdbusmenu
import dbus import dbus, sip
from PyQt5.Qt import ( from PyQt5.Qt import (
QApplication, QMenu, QIcon, QKeySequence, QObject, QEvent, QTimer, pyqtSignal, Qt) QApplication, QMenu, QIcon, QKeySequence, QObject, QEvent, QTimer, pyqtSignal, Qt)
@ -212,7 +212,9 @@ class DBusMenu(QObject):
return changes return changes
def action_is_in_a_menu(self, ac): def action_is_in_a_menu(self, ac):
all_menus = {ac.menu() for ac in self._action_to_id} if sip.isdeleted(ac):
return False
all_menus = {a.menu() for a in self._action_to_id if not sip.isdeleted(a)}
all_menus.discard(None) all_menus.discard(None)
return bool(set(ac.associatedWidgets()).intersection(all_menus)) return bool(set(ac.associatedWidgets()).intersection(all_menus))