From 2de31650e38bd3f22c06622aec9f1d83c9a55488 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Mon, 15 Mar 2021 15:10:57 +0000 Subject: [PATCH] More Bug #1919128: Template: Sometimes returns device name after eject. The previous fix didn't work for programmatically ejected unmanaged and standard devices --- src/calibre/gui2/device.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 77ffd915e7..af77199a51 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -352,7 +352,7 @@ class DeviceManager(Thread): # {{{ self.connected_device.eject() if self.connected_device_kind != 'unmanaged-device': self.ejected_devices.add(self.connected_device) - self.connected_slot(False, self.connected_device_kind) + self.connected_slot(False, None) elif hasattr(self.connected_device, 'unmount_device'): # As we are on the wrong thread, this call must *not* do # anything besides set a flag that the right thread will see. @@ -508,7 +508,7 @@ class DeviceManager(Thread): # {{{ self._device_information['info'] = tuple(info) def get_current_device_information(self): - return self._device_information + return self._device_information if self.is_device_present else None def _books(self): '''Get metadata from device'''