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

CHANGES.md

@@ -34,6 +34,7 @@
 * 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
 * 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)

sickbeard/tv.py

@@ -806,7 +806,11 @@ class TVShow(object):
             self.flatten_folders = int(sqlResults[0]["flatten_folders"])
             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:
                 self.lang = sqlResults[0]["lang"]