wrap GetStreamDetails in try/catch

xbmc · Nov 18, 2012 · 94372af · 94372af
1 parent 2620d2a
commit 94372af
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
@@ -3075,12 +3075,15 @@ bool CVideoDatabase::GetStreamDetails(CVideoInfoTag& tag) const
 
   bool retVal = false;
 
+  CStreamDetails& details = tag.m_streamDetails;
+  details.Reset();
+
   auto_ptr<Dataset> pDS(m_pDB->CreateDataset());
+  try
+  {
   CStdString strSQL = PrepareSQL("SELECT * FROM streamdetails WHERE idFile = %i", tag.m_iFileId);
   pDS->query(strSQL);
 
-  CStreamDetails& details = tag.m_streamDetails;
-  details.Reset();
   while (!pDS->eof())
   {
     CStreamDetail::StreamType e = (CStreamDetail::StreamType)pDS->fv(1).get_asInt();
@@ -3125,6 +3128,11 @@ bool CVideoDatabase::GetStreamDetails(CVideoInfoTag& tag) const
   }
 
   pDS->close();
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, tag.m_iFileId);
+  }
   details.DetermineBestStreams();
 
   if (details.GetVideoDuration() > 0)