[date/time] have SetFromDateString() first attempt SetFromDBDate() before attempting to parse for a 'Sunday, April 15 2006' style date

1 files changed, 5 insertions, 2 deletions

diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
index 8525691fea..995f9b7ded 100644
--- a/xbmc/XBDateTime.cpp
+++ b/xbmc/XBDateTime.cpp
@@ -696,6 +696,9 @@ bool CDateTime::SetFromDateString(const CStdString &date)
     return false;
   }
 
+  if (SetFromDBDate(date))
+    return true;
+
   const char* months[] = {"january","february","march","april","may","june","july","august","september","october","november","december",NULL};
   int j=0;
   size_t iDayPos = date.find("day");
@@ -709,8 +712,8 @@ bool CDateTime::SetFromDateString(const CStdString &date)
     iDayPos = 0;
 
   CStdString strMonth = date.substr(iDayPos, iPos - iDayPos);
-  if (strMonth.empty()) // assume dbdate format
-    return SetFromDBDate(date);
+  if (strMonth.empty())
+    return false;
 
   size_t iPos2 = date.find(",");
   CStdString strDay = (date.size() >= iPos) ? date.substr(iPos, iPos2-iPos) : "";