Re: [PATCH] device: clear nm_device_state_changed() re-entry check on early exit



Pushed, thanks!

Dan

On Wed, 2012-10-10 at 17:30 +0200, Aleksander Morgado wrote:
> ---
>  src/nm-device.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/nm-device.c b/src/nm-device.c
> index 9063306..3d84d0b 100644
> --- a/src/nm-device.c
> +++ b/src/nm-device.c
> @@ -4574,8 +4574,10 @@ nm_device_state_changed (NMDevice *device,
>  	 * can retry device initialization.
>  	 */
>  	if (   (priv->state == state)
> -	    && !(state == NM_DEVICE_STATE_UNAVAILABLE && priv->firmware_missing))
> +	    && !(state == NM_DEVICE_STATE_UNAVAILABLE && priv->firmware_missing)) {
> +		in_state_changed = FALSE;
>  		return;
> +	}
>  
>  	old_state = priv->state;
>  	priv->state = state;




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]