From 120f3e1c10c36fd5d174741d0da81ba84fc79ae3 Mon Sep 17 00:00:00 2001
From: Robert Bieber <robby@bieberphoto.com>
Date: Tue, 6 Jul 2010 19:32:12 +0000
Subject: Theme Editor: Default theme font is now correctly loaded

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27321 a1c6a512-1295-4272-9138-f99709370657
---
 utils/themeeditor/graphics/rbscreen.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index c212a6c1fc..df72d5005b 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -73,7 +73,13 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
         }
     }
 
-    fonts.insert(0, new RBFont("Nothin'"));
+    fonts.insert(0, new RBFont("Default"));
+    QString defaultFont = settings->value("font", "");
+    if(defaultFont != "")
+    {
+        defaultFont.replace("/.rockbox", settings->value("themebase", ""));
+        fonts.insert(1, new RBFont(defaultFont));
+    }
 
     if(parent == 0)
     {
-- 
cgit v1.2.3