From 4b3059e9794240b57bcc2cf869325d426e37dd44 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Thu, 7 Jan 2010 07:21:18 -0500
Subject: [PATCH] USBMS: Use default send template when device specific one is
 not present.

---
 src/calibre/devices/usbms/device.py       |  2 +-
 src/calibre/devices/usbms/deviceconfig.py | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index e852ae7f62..f01133c301 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -805,7 +805,7 @@ class Device(DeviceConfig, DevicePlugin):
                     break
 
         settings = self.settings()
-        template = settings.save_template
+        template = self.save_template()
         use_subdirs = self.SUPPORTS_SUB_DIRS and settings.use_subdirs
 
         fname = sanitize(fname)
diff --git a/src/calibre/devices/usbms/deviceconfig.py b/src/calibre/devices/usbms/deviceconfig.py
index 925347ef79..a8220261f3 100644
--- a/src/calibre/devices/usbms/deviceconfig.py
+++ b/src/calibre/devices/usbms/deviceconfig.py
@@ -64,12 +64,20 @@ class DeviceConfig(object):
                 ec = None
             proxy['extra_customization'] = ec
         st = unicode(config_widget.opt_save_template.text())
-        proxy['save_template'] = st if st else cls._default_save_template()
+        proxy['save_template'] = st
 
     @classmethod
     def settings(cls):
         return cls._config().parse()
 
+    @classmethod
+    def save_template(cls):
+        st = cls.settings().save_template
+        if st:
+            return st
+        else:
+            return cls._default_save_template()
+
     @classmethod
     def customization_help(cls, gui=False):
         return cls.HELP_MESSAGE