colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispatcher: move clearing @quit_id in handle_action()

Browse Source 
First create and initialize @request, and then start it.
This commit is contained in:
Thomas Haller
2015-08-03 16:17:34 +02:00
committed by Beniamino Galvani
parent 8143d895ca
commit 38fa197bab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
callouts/nm-dispatcher.c
View File

@@ -635,8 +635,6 @@ handle_action (NMDBusDispatcher *dbus_dispatcher,
return TRUE; return TRUE;
} }
nm_clear_g_source (&quit_id);
request = g_slice_new0 (Request); request = g_slice_new0 (Request);
request->handler = h; request->handler = h;
request->debug = request_debug || debug; request->debug = request_debug || debug;
@@ -677,6 +675,9 @@ handle_action (NMDBusDispatcher *dbus_dispatcher,
g_ptr_array_add (request->scripts, s); g_ptr_array_add (request->scripts, s);
} }
g_slist_free (sorted_scripts); g_slist_free (sorted_scripts);
nm_clear_g_source (&quit_id);
h->num_requests_pending++; h->num_requests_pending++;
for (i = 0; i < request->scripts->len; i++) { for (i = 0; i < request->scripts->len; i++) {