From ba7016b0bcebf92fb0e29fe88e39201b90ccc4f2 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Tue, 22 Nov 2011 05:08:04 -0400
Subject: [PATCH] Don't call office converter if not initialized

---
 apps/converter/api.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/converter/api.py b/apps/converter/api.py
index 3567800d79..3988ab343e 100644
--- a/apps/converter/api.py
+++ b/apps/converter/api.py
@@ -50,17 +50,19 @@ def convert(input_filepath, output_filepath=None, cleanup_files=False, mimetype=
         
     if os.path.exists(output_filepath):
         return output_filepath
-    
-    office_converter.convert(input_filepath, mimetype=mimetype)
+
     if office_converter:
         try:
-            input_filepath = office_converter.output_filepath
-            mimetype = 'application/pdf'
+            office_converter.convert(input_filepath, mimetype=mimetype)
+            if office_converter.exists:
+                input_filepath = office_converter.output_filepath
+                mimetype = 'application/pdf'
+            else:
+                # Recycle the already detected mimetype
+                mimetype = office_converter.mimetype
+
         except OfficeConverter:
-            raise UnknownFileFormat('office converter exception')
-    else:
-        # Recycle the already detected mimetype
-        mimetype = office_converter.mimetype
+                raise UnknownFileFormat('office converter exception')
 
     if size:
         transformations.append(