Fixed two crashers

[modest] / src / widgets / modest-folder-view.c

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 2c06336..8bc1576 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1943,13 +1943,14 @@ on_configuration_key_changed (ModestConf* conf,
 {
        ModestFolderViewPrivate *priv;
 
-       /* Do not listen for changes in other namespaces */
-       if (priv->notification_id != id)
-               return;
 
        g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
+       /* Do not listen for changes in other namespaces */
+       if (priv->notification_id != id)
+                return;
+        
        if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
                g_free (priv->local_account_name);