diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-04-07 11:10:32 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-04-27 14:00:59 -0500 |
| commit | 014c04e73423c2d7d1f7e12ee6b5ead6f2aa917c (patch) | |
| tree | bbf1ce50a98ea82e12315e16c6849255e9715293 | |
| parent | d9c537ec64d2ffae36c0c28d8bef77d7346e7837 (diff) | |
| download | NetworkManager-014c04e73423c2d7d1f7e12ee6b5ead6f2aa917c.tar.gz | |
fixup! core: don't activate failed queued activation requests
| -rw-r--r-- | src/devices/nm-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index e9cf3b6097..ed111d5032 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5946,7 +5946,8 @@ nm_device_queue_activation (NMDevice *self, NMActRequest *req) if (!priv->act_request && !must_queue) { /* Just activate immediately */ - g_assert (_device_activate (self, req)); + if (!_device_activate (self, req)) + g_assert_not_reached (); return; } |