Fixes FwNULL 13/16

pmo-trunk-r8177

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index bbf8f9d..1d96d52 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -778,12 +778,14 @@ modest_account_mgr_save_account_settings (ModestAccountMgr *mgr,
        g_object_unref (store_settings);
 
        transport_settings = modest_account_settings_get_transport_settings (settings);
-       transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
-       if (transport_settings != NULL) {
+       if (transport_settings) {
+               transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
+               if (transport_account_name)
+                       modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, 
+                                                      transport_account_name, FALSE);
                modest_account_mgr_save_server_settings (mgr, transport_settings);
+               g_object_unref (transport_settings);
        }
-       modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, transport_account_name, FALSE);
-       g_object_unref (transport_settings);
        modest_account_mgr_set_enabled (mgr, account_name, TRUE);
 }