2007-05-09 [colin] 2.9.2cvs2

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index dc23059e56d76d36df497435b547c4fd72cf6ea2..36be413ca2b1e0808b0632a8280676b3b3012a69 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -792,8 +792,8 @@ static IMAPSession *imap_session_get(Folder *folder)
                        debug_print("disconnected!\n");
                        session = imap_reconnect_if_possible(folder, session);
                }
-               
-               session->cancelled = FALSE;
+               if (session)
+                       session->cancelled = FALSE;
        }
 
        rfolder->session = SESSION(session);
@@ -4702,7 +4702,8 @@ void imap_cancel_all(void)
                                imap_threaded_cancel(folder);
                                rfolder = (RemoteFolder *) folder;
                                imap_session = (IMAPSession *) rfolder->session;
-                               imap_session->cancelled = 1;
+                               if (imap_session)
+                                       imap_session->cancelled = 1;
                        }
                }
        }