From 00a83e6151fb78393af6f5f4be484d7cb4db472a Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Wed, 13 Feb 2019 08:49:32 +0100
Subject: [PATCH] PICARD-323: Fix overriding item#load should not add parameter

---
 picard/album.py  | 8 ++++----
 picard/tagger.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/picard/album.py b/picard/album.py
index 55bef2917..72c1742a9 100644
--- a/picard/album.py
+++ b/picard/album.py
@@ -79,7 +79,7 @@ class Album(DataObject, Item):
 
     release_group_loaded = QtCore.pyqtSignal()
 
-    def __init__(self, album_id):
+    def __init__(self, album_id, discid=None):
         DataObject.__init__(self, album_id)
         self.metadata = Metadata()
         self.orig_metadata = Metadata()
@@ -91,6 +91,8 @@ class Album(DataObject, Item):
         self._requests = 0
         self._tracks_loaded = False
         self._discids = set()
+        if discid:
+            self._discids.add(discid)
         self._after_load_callbacks = []
         self.unmatched_files = Cluster(_("Unmatched Files"), special=True, related_album=self, hide_if_empty=True)
         self.errors = []
@@ -370,7 +372,7 @@ class Album(DataObject, Item):
 
         return track
 
-    def load(self, priority=False, refresh=False, discid=None):
+    def load(self, priority=False, refresh=False):
         if self._requests:
             log.info("Not reloading, some requests are still active.")
             return
@@ -390,8 +392,6 @@ class Album(DataObject, Item):
         self._new_tracks = []
         self._requests = 1
         self.errors = []
-        if discid:
-            self._discids.add(discid)
         require_authentication = False
         inc = ['release-groups', 'media', 'discids', 'recordings', 'artist-credits',
                'artists', 'aliases', 'labels', 'isrcs', 'collections']
diff --git a/picard/tagger.py b/picard/tagger.py
index 4570eadb4..b8db9ef8f 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -606,10 +606,10 @@ class Tagger(QtWidgets.QApplication):
             log.debug("Album %s already loaded.", album_id)
             album.add_discid(discid)
             return album
-        album = Album(album_id)
+        album = Album(album_id, discid=discid)
         self.albums[album_id] = album
         self.album_added.emit(album)
-        album.load(discid=discid)
+        album.load()
         return album
 
     def load_nat(self, nat_id, node=None):