From 87b900d89751fb6b6a575a69dd9de060515f6f1b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Mon, 20 May 2013 14:45:19 +0200
Subject: [PATCH] fix IndexError when merging episodes of single podcast

---
 mygpo/admin/tasks.py       | 4 ++--
 mygpo/maintenance/merge.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mygpo/admin/tasks.py b/mygpo/admin/tasks.py
index 2253d5ff..0e998768 100644
--- a/mygpo/admin/tasks.py
+++ b/mygpo/admin/tasks.py
@@ -21,8 +21,8 @@ def merge_podcasts(podcast_ids, num_groups):
     actions = Counter()
 
     pm = PodcastMerger(podcasts, actions, num_groups)
-    pm.merge()
+    podcast = pm.merge()
 
     logger.info('merging result: %s', actions)
 
-    return actions, podcasts[0]
+    return actions, podcast
diff --git a/mygpo/maintenance/merge.py b/mygpo/maintenance/merge.py
index ae960d4d..b7bfd42c 100644
--- a/mygpo/maintenance/merge.py
+++ b/mygpo/maintenance/merge.py
@@ -47,6 +47,8 @@ class PodcastMerger(object):
             delete_podcast(podcast2)
             self.actions['merge-podcast'] += 1
 
+        return podcast1
+
     def merge_episodes(self):
         """ Merges the episodes according to the groups """
 
-- 
2.11.4.GIT