From 8d74b11bd3a5627490a25c52ffddae0843c2ee49 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 25 Feb 2013 12:04:23 +0100 Subject: plugin-manager: cancelled tasks are no longer deferred-until-suggested The deferred-until-suggested tasks specify tasks that are open/ongoing; cancelled tasks shouldn't have this flag set. https://bugzilla.gnome.org/show_bug.cgi?id=694603 --- src/mm-plugin-manager.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/mm-plugin-manager.c b/src/mm-plugin-manager.c index 3cd0e01a..bae877a6 100644 --- a/src/mm-plugin-manager.c +++ b/src/mm-plugin-manager.c @@ -280,6 +280,10 @@ suggest_port_probe_result (FindDeviceSupportContext *ctx, /* If we got a task deferred until a suggestion comes, * complete it */ if (port_probe_ctx->defer_until_suggested) { + /* Reset the defer until suggested flag; we consider this + * cancelled probe completed now. */ + port_probe_ctx->defer_until_suggested = FALSE; + if (suggested_plugin) { mm_dbg ("(Plugin Manager) (%s) [%s] deferred task completed, got suggested plugin", mm_plugin_get_name (suggested_plugin), -- cgit v1.2.3-70-g09d2