fixed a bug in imap.c - imap_fetch_msginfo() - in case there is no current folder

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index f8ce7ed1adfe0ee56f249d3e7f74f7337714a260..7270f39902f81c5ebadb2eb9bdaa6ad69f3e48a5 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3161,6 +3161,7 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
        IMAPSession *session;
        GString *str;
        MsgInfo *msginfo;
+       int same_folder;
        
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
@@ -3170,7 +3171,12 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
        session = imap_session_get(_folder);
        g_return_val_if_fail(session != NULL, NULL);
 
-       if(strcmp(folder->selected_folder, item->path) != 0) {
+       same_folder = FALSE;
+       if (folder->selected_folder != NULL)
+               if (strcmp(folder->selected_folder, item->path) == 0)
+                       same_folder = TRUE;
+       
+       if (!same_folder) {
                gint ok, exists = 0, recent = 0, unseen = 0;
                guint32 uid_validity = 0;
 
@@ -3179,7 +3185,7 @@ MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
                if (ok != IMAP_SUCCESS)
                        return NULL;
        }
-               
+       
        if (imap_cmd_envelope(SESSION(session)->sock, num, num)
            != IMAP_SUCCESS) {
                log_warning(_("can't get envelope\n"));