From 7871dfdf001d69773e80729dac04fe7029c09073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 01:55:53 +0300
Subject: [PATCH] Cleanup.

---
 openlp/plugins/songs/lib/__init__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index b6177c3d7..3f3d3ad7d 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -559,7 +559,6 @@ def strip_rtf(text, default_encoding=None):
                 out.append(unichr(c))
                 curskip = ucskip
             elif word == u'fonttbl':
-                inside_font_table = True
                 ignorable = True
             elif word == u'f':
                 font = arg
@@ -575,14 +574,14 @@ def strip_rtf(text, default_encoding=None):
                 curskip -= 1
             elif not ignorable:
                 charcode = int(hex, 16)
-                encoding, default_encoding = get_encoding(font, font_table,
-                    default_encoding)
+                failed = False
                 while True:
                     try:
+                        encoding, default_encoding = get_encoding(font, 
+                            font_table, default_encoding, failed=failed)
                         out.append(chr(charcode).decode(encoding))
                     except UnicodeDecodeError:
-                        encoding, default_encoding = get_encoding(font,
-                            font_table, default_encoding, failed=True)
+                        failed = True
                     else:
                         break
         elif tchar: