aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarnova <arnova@svn>2009-12-10 23:48:13 +0000
committerarnova <arnova@svn>2009-12-10 23:48:13 +0000
commit713641c4237714c8d71918ca0049e125cdbb7935 (patch)
tree9faf9d259aff27bdbf055af5166a7c73170ec352
parent5d85853d8ecdbe8692076b5f5d0c59e1695dfebb (diff)
fixed: Cosmetics + errors in previous commit
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25536 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--xbmc/VideoDatabase.cpp96
1 files changed, 40 insertions, 56 deletions
diff --git a/xbmc/VideoDatabase.cpp b/xbmc/VideoDatabase.cpp
index f6b635d4ec..ce310fea8f 100644
--- a/xbmc/VideoDatabase.cpp
+++ b/xbmc/VideoDatabase.cpp
@@ -6998,23 +6998,19 @@ void CVideoDatabase::ExportToXML(const CStdString &xmlFile, bool singleFiles /*
if (overwrite || !CFile::Exists(nfoFile))
{
- if(xmlDoc.SaveFile(nfoFile))
+ if(!xmlDoc.SaveFile(nfoFile))
{
- bSkip = ExportSkipEntry(nfoFile);
- if (!bSkip)
+ CLog::Log(LOGERROR, "%s: Movie nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
+ bSkip = ExportSkipEntry(nfoFile);
+ if (!bSkip)
+ {
+ if (progress)
{
- if (progress)
- {
- progress->Close();
- m_pDS->close();
- return;
- }
+ progress->Close();
+ m_pDS->close();
+ return;
}
- }
- else
- {
- CLog::Log(LOGERROR, "%s: Movie nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
- bSkip = true;
+ }
}
}
@@ -7085,23 +7081,19 @@ void CVideoDatabase::ExportToXML(const CStdString &xmlFile, bool singleFiles /*
if (overwrite || !CFile::Exists(nfoFile))
{
- if(xmlDoc.SaveFile(nfoFile))
+ if(!xmlDoc.SaveFile(nfoFile))
{
- bSkip = ExportSkipEntry(nfoFile);
- if (!bSkip)
+ CLog::Log(LOGERROR, "%s: Musicvideo nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
+ bSkip = ExportSkipEntry(nfoFile);
+ if (!bSkip)
+ {
+ if (progress)
{
- if (progress)
- {
- progress->Close();
- m_pDS->close();
- return;
- }
+ progress->Close();
+ m_pDS->close();
+ return;
}
- }
- else
- {
- CLog::Log(LOGERROR, "%s: Musicvideo nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
- bSkip = true;
+ }
}
}
@@ -7163,23 +7155,19 @@ void CVideoDatabase::ExportToXML(const CStdString &xmlFile, bool singleFiles /*
if (overwrite || !CFile::Exists(nfoFile))
{
- if(xmlDoc.SaveFile(nfoFile))
+ if(!xmlDoc.SaveFile(nfoFile))
{
- bSkip = ExportSkipEntry(nfoFile);
- if (!bSkip)
+ CLog::Log(LOGERROR, "%s: TVShow nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
+ bSkip = ExportSkipEntry(nfoFile);
+ if (!bSkip)
+ {
+ if (progress)
{
- if (progress)
- {
- progress->Close();
- m_pDS->close();
- return;
- }
+ progress->Close();
+ m_pDS->close();
+ return;
}
- }
- else
- {
- CLog::Log(LOGERROR, "%s: TVShow nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
- bSkip = true;
+ }
}
}
@@ -7278,23 +7266,19 @@ void CVideoDatabase::ExportToXML(const CStdString &xmlFile, bool singleFiles /*
if (overwrite || !CFile::Exists(nfoFile))
{
- if(xmlDoc.SaveFile(nfoFile))
+ if(!xmlDoc.SaveFile(nfoFile))
{
- bSkip = ExportSkipEntry(nfoFile);
- if (!bSkip)
+ CLog::Log(LOGERROR, "%s: Episode nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
+ bSkip = ExportSkipEntry(nfoFile);
+ if (!bSkip)
+ {
+ if (progress)
{
- if (progress)
- {
- progress->Close();
- m_pDS->close();
- return;
- }
+ progress->Close();
+ m_pDS->close();
+ return;
}
- }
- else
- {
- CLog::Log(LOGERROR, "%s: Episode nfo export failed! ('%s')", __FUNCTION__, nfoFile.c_str());
- bSkip = true;
+ }
}
}