From 6460f08b7fbb2365ecd1542bedb6ec55687297c0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 Feb 2011 20:17:57 -0700
Subject: [PATCH] Only start emailer thread on demand

---
 src/calibre/gui2/email.py | 5 ++++-
 src/calibre/gui2/ui.py    | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index 426747e044..c84b3180f7 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -209,7 +209,6 @@ class EmailMixin(object): # {{{
 
     def __init__(self):
         self.emailer = Emailer(self.job_manager)
-        self.emailer.start()
 
     def send_by_mail(self, to, fmts, delete_from_library, send_ids=None,
             do_auto_convert=True, specific_format=None):
@@ -255,6 +254,8 @@ class EmailMixin(object): # {{{
 
         to_s = list(repeat(to, len(attachments)))
         if attachments:
+            if not self.emailer.is_alive():
+                self.emailer.start()
             self.emailer.send_mails(jobnames,
                     Dispatcher(partial(self.email_sent, remove=remove)),
                     attachments, to_s, subjects, texts, attachment_names)
@@ -325,6 +326,8 @@ class EmailMixin(object): # {{{
             files, auto = self.library_view.model().\
                     get_preferred_formats_from_ids([id_], fmts)
             return files
+        if not self.emailer.is_alive():
+            self.emailer.start()
         sent_mails = self.emailer.email_news(mi, remove,
                 get_fmts, self.email_sent)
         if sent_mails:
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 9b9308d253..8844446de6 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -633,7 +633,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
             mb.stop()
 
         self.hide_windows()
-        self.emailer.stop()
+        if self.emailer.is_alive():
+            self.emailer.stop()
         try:
             try:
                 if self.content_server is not None: