From a07767d658cc0cef6ea975569ef15e5e1e1b59d7 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 14 May 2013 15:54:55 +0000
Subject: [PATCH] dont load subtitles, causes data loss

---
 pandora/item/models.py | 2 --
 pandora/item/tasks.py  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pandora/item/models.py b/pandora/item/models.py
index 566942ff..5df267a0 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -1122,10 +1122,8 @@ class Item(models.Model):
         self.rendered = streams.count() > 0
         self.save()
         if async:
-            tasks.load_subtitles.delay(self.itemId)
             get_sequences.delay(self.itemId)
         else:
-            tasks.load_subtitles(self.itemId)
             get_sequences(self.itemId)
 
     def save_poster(self, data):
diff --git a/pandora/item/tasks.py b/pandora/item/tasks.py
index 9e4cf2e2..f10f0612 100644
--- a/pandora/item/tasks.py
+++ b/pandora/item/tasks.py
@@ -78,7 +78,7 @@ def rebuild_timeline(itemId):
     i = models.Item.objects.get(itemId=itemId)
     for s in i.streams():
         s.make_timeline()
-    i.update_timeline()
+    i.update_timeline(async=False)
 
 @task(queue="encoding")
 def load_subtitles(itemId):