diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-27 21:35:23 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-26 13:27:21 +0200 |
| commit | 022925752d37209c54a078c4be045a5da3eabe72 (patch) | |
| tree | db11216713e06f48fa0a24259158ce1eb9aad5e3 | |
| parent | 0de26b274f0dbe564edaad2ab0221c141e81ea11 (diff) | |
| download | network-manager-applet-022925752d37209c54a078c4be045a5da3eabe72.tar.gz | |
libnma/wifi-dialog: fix assertion failure on changing a device
connection_combo_init() is also called when the device combo is changed.
Don't assume the connection is NULL; it is not going to be.
| -rw-r--r-- | src/libnma/nma-wifi-dialog.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c index 3204be08..3ac5fd68 100644 --- a/src/libnma/nma-wifi-dialog.c +++ b/src/libnma/nma-wifi-dialog.c @@ -432,11 +432,8 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection) GtkCellRenderer *renderer; const char *id; - g_return_val_if_fail (priv->connection == NULL, FALSE); - - /* Clear any old model */ - if (priv->connection_model) - g_object_unref (priv->connection_model); + g_clear_object (&priv->connection_model); + g_clear_object (&priv->connection); /* New model */ store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); |