From b7f2788244479b03753718d0b4a20799f2a7be6f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 31 Aug 2012 15:11:08 +0530
Subject: [PATCH] ...

---
 src/calibre/ebooks/pdf/writer.py     | 14 +++++++++-----
 src/calibre/gui2/convert/__init__.py |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py
index d6ffa42107..d37db69a81 100644
--- a/src/calibre/ebooks/pdf/writer.py
+++ b/src/calibre/ebooks/pdf/writer.py
@@ -137,11 +137,15 @@ class Page(QWebPage):
         std = {'serif':opts.pdf_serif_family, 'sans':opts.pdf_sans_family,
                 'mono':opts.pdf_mono_family}.get(opts.pdf_standard_font,
                         opts.pdf_serif_family)
-        settings.setFontFamily(QWebSettings.StandardFont, std)
-        settings.setFontFamily(QWebSettings.SerifFont, opts.pdf_serif_family)
-        settings.setFontFamily(QWebSettings.SansSerifFont,
-                opts.pdf_sans_family)
-        settings.setFontFamily(QWebSettings.FixedFont, opts.pdf_mono_family)
+        if std:
+            settings.setFontFamily(QWebSettings.StandardFont, std)
+        if opts.pdf_serif_family:
+            settings.setFontFamily(QWebSettings.SerifFont, opts.pdf_serif_family)
+        if opts.pdf_sans_family:
+            settings.setFontFamily(QWebSettings.SansSerifFont,
+                    opts.pdf_sans_family)
+        if opts.pdf_mono_family:
+            settings.setFontFamily(QWebSettings.FixedFont, opts.pdf_mono_family)
 
     def javaScriptConsoleMessage(self, msg, lineno, msgid):
         self.log.debug(u'JS:', unicode(msg))
diff --git a/src/calibre/gui2/convert/__init__.py b/src/calibre/gui2/convert/__init__.py
index e01238a2e5..38fb641987 100644
--- a/src/calibre/gui2/convert/__init__.py
+++ b/src/calibre/gui2/convert/__init__.py
@@ -143,7 +143,7 @@ class Widget(QWidget):
                 ans = None
             return ans
         elif isinstance(g, QFontComboBox):
-            ans = unicode(QFontInfo(g.currentFont().family()))
+            return unicode(QFontInfo(g.currentFont()).family())
         elif isinstance(g, EncodingComboBox):
             ans = unicode(g.currentText()).strip()
             try: