From 93013855050f06245fee2eb9ce3969e04703e8f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 14 May 2010 21:44:30 -0600
Subject: [PATCH] Fix bug that caused send to device to send ultiple copies to
 the device if you used Prefrences

---
 src/calibre/gui2/ui.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 99ab5470dc..ab5edd3964 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -396,6 +396,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         self.action_sync.setShortcut(Qt.Key_D)
         self.action_sync.setEnabled(True)
         self.create_device_menu()
+        self.connect(self.action_sync, SIGNAL('triggered(bool)'),
+                self._sync_action_triggered)
+
         self.action_edit.setMenu(md)
         self.action_save.setMenu(self.save_menu)
 
@@ -641,6 +644,10 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         MainWindow.resizeEvent(self, ev)
         self.search.setMaximumWidth(self.width()-150)
 
+    def _sync_action_triggered(self, *args):
+        m = getattr(self, '_sync_menu', None)
+        if m is not None:
+            m.trigger_default()
 
     def create_device_menu(self):
         self._sync_menu = DeviceMenu(self)
@@ -648,8 +655,6 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         self.connect(self._sync_menu,
                 SIGNAL('sync(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
                 self.dispatch_sync_event)
-        self.connect(self.action_sync, SIGNAL('triggered(bool)'),
-                self._sync_menu.trigger_default)
         self._sync_menu.fetch_annotations.connect(self.fetch_annotations)
 
     def add_spare_server(self, *args):