imapc: Added assert.

diff --git a/src/lib-storage/index/imapc/imapc-client.c b/src/lib-storage/index/imapc/imapc-client.c
index 9982237b9ea17a7e052efe1e3034fcc73e10b834..54f84bf5af3e5cf609b14df809afdb030a52702d 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-client.c
+++ b/src/lib-storage/index/imapc/imapc-client.c
@@ -136,6 +136,11 @@ void imapc_client_stop(struct imapc_client *client)
                io_loop_stop(client->ioloop);
 }
 
+bool imapc_client_is_running(struct imapc_client *client)
+{
+       return client->ioloop != NULL;
+}
+
 void imapc_client_stop_now(struct imapc_client *client)
 {
        client->stop_now = TRUE;

diff --git a/src/lib-storage/index/imapc/imapc-client.h b/src/lib-storage/index/imapc/imapc-client.h
index 7b848094d35ab118c5a27b7823106718c218734a..3180adf30bd786f33c4c91decd419a07d50d0fdb 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-client.h
+++ b/src/lib-storage/index/imapc/imapc-client.h
@@ -117,6 +117,7 @@ void imapc_client_stop(struct imapc_client *client);
 /* Stop immediately, don't finish even any already read pending replies.
    They'll be finished when imapc_client_run() is again called. */
 void imapc_client_stop_now(struct imapc_client *client);
+bool imapc_client_is_running(struct imapc_client *client);
 
 struct imapc_client_mailbox *
 imapc_client_mailbox_open(struct imapc_client *client,

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index d37a7da24c684d8c9d449441410d2c37f324b6fe..8c3b0c2571956f7885a59a18892f6c0f8c0035c5 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -542,6 +542,7 @@ static void imapc_notify_changes(struct mailbox *box)
        } else {
                /* remote server doesn't support IDLE.
                   check for changes with NOOP every once in a while. */
+               i_assert(!imapc_client_is_running(mbox->storage->client));
                mbox->to_idle_check =
                        timeout_add(box->notify_min_interval * 1000,
                                    imapc_idle_timeout, mbox);