dfu: Fix critical warning when using dfu-tool

Actually connect to the correct object.

Fixes https://github.com/fwupd/fwupd/issues/3975
This commit is contained in:
Richard Hughes 2021-11-12 14:49:06 +00:00
parent b87a909223
commit f9cba32625

View File

@ -594,8 +594,11 @@ fu_dfu_tool_read(FuDfuTool *self, gchar **values, GError **error)
} }
/* transfer */ /* transfer */
g_signal_connect(device, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(device, "percentage-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress,
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
firmware = fu_dfu_device_upload(device, progress, flags, error); firmware = fu_dfu_device_upload(device, progress, flags, error);
if (firmware == NULL) if (firmware == NULL)
return FALSE; return FALSE;
@ -666,8 +669,11 @@ fu_dfu_tool_write_alt(FuDfuTool *self, gchar **values, GError **error)
return FALSE; return FALSE;
/* set up progress */ /* set up progress */
g_signal_connect(device, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(device, "percentage-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress,
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
/* APP -> DFU */ /* APP -> DFU */
if (!fu_device_has_flag(FU_DEVICE(device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER)) { if (!fu_device_has_flag(FU_DEVICE(device), FWUPD_DEVICE_FLAG_IS_BOOTLOADER)) {
@ -794,8 +800,11 @@ fu_dfu_tool_write(FuDfuTool *self, gchar **values, GError **error)
} }
/* transfer */ /* transfer */
g_signal_connect(device, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(device, "percentage-changed", G_CALLBACK(fu_tool_action_changed_cb), self); g_signal_connect(progress,
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
if (!fu_device_write_firmware(FU_DEVICE(device), fw, progress, flags, error)) if (!fu_device_write_firmware(FU_DEVICE(device), fw, progress, flags, error))
return FALSE; return FALSE;