monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-08 02:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/FixInvalidShowFolders' of https://github.com/adam111316/SickRage into develop

Browse source
This commit is contained in:
Adam 2014-10-29 12:34:32 +08:00
commit d7b4d868a0
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -34,6 +34,7 @@
* Removed qtip from providers and converted back to a tab * Removed qtip from providers and converted back to a tab
* Removed superfish-1.4.8.js and supersubs-0.2b.js as they no longer break provider sorting with qtip removed and is no longer required due to new UI * Removed superfish-1.4.8.js and supersubs-0.2b.js as they no longer break provider sorting with qtip removed and is no longer required due to new UI
* Overhaul Config Search Settings in line with General Configuration * Overhaul Config Search Settings in line with General Configuration
* Fixes errors occurring when a show folder is deleted outside of SickRage
### 0.2.1 (2014-10-22 06:41:00 UTC) ### 0.2.1 (2014-10-22 06:41:00 UTC)

6
sickbeard/tv.py
View file

@ -806,7 +806,11 @@ class TVShow(object):
self.flatten_folders = int(sqlResults[0]["flatten_folders"]) self.flatten_folders = int(sqlResults[0]["flatten_folders"])
self.paused = int(sqlResults[0]["paused"]) self.paused = int(sqlResults[0]["paused"])
self.location = sqlResults[0]["location"] try:
self.location = sqlResults[0]["location"]
except Exception:
dirty_setter("_location")(self, sqlResults[0]["location"])
self._isDirGood = False
if not self.lang: if not self.lang:
self.lang = sqlResults[0]["lang"] self.lang = sqlResults[0]["lang"]