diff options
| author |   Aleksander Morgado <aleksander@lanedo.com> | 2013-02-25 12:04:23 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-02-25 15:28:47 +0100 |
| commit | 8d74b11bd3a5627490a25c52ffddae0843c2ee49 (patch) | |
| tree | 1eed440fa889a726382ab8f71aef95cefc081b16 | |
| parent | 8488782e1424db0ec42839b4713373b588224a3e (diff) | |
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
| -rw-r--r-- | src/mm-plugin-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
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), |