From 08a59b31c2e19bd46a80b7ef2fc1130d1b47bc17 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Tue, 4 Jan 2011 21:04:49 +0000
Subject: [PATCH] Fix problem with EXTRA_CUSTOMIZATION lists when there was no
 customization before.

---
 src/calibre/devices/usbms/deviceconfig.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/usbms/deviceconfig.py b/src/calibre/devices/usbms/deviceconfig.py
index 769543f7cc..940ea96f38 100644
--- a/src/calibre/devices/usbms/deviceconfig.py
+++ b/src/calibre/devices/usbms/deviceconfig.py
@@ -106,12 +106,13 @@ class DeviceConfig(object):
     def settings(cls):
         opts = cls._config().parse()
         if isinstance(cls.EXTRA_CUSTOMIZATION_DEFAULT, list):
+            if opts.extra_customization is None:
+                opts.extra_customization = []
             if not isinstance(opts.extra_customization, list):
                 opts.extra_customization = [opts.extra_customization]
-            else:
-                for i,d in enumerate(cls.EXTRA_CUSTOMIZATION_DEFAULT):
-                    if i >= len(opts.extra_customization):
-                        opts.extra_customization.append(d)
+            for i,d in enumerate(cls.EXTRA_CUSTOMIZATION_DEFAULT):
+                if i >= len(opts.extra_customization):
+                    opts.extra_customization.append(d)
         return opts
 
     @classmethod