aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrenniej <renniej@svn>2010-09-12 09:21:36 +0000
committerrenniej <renniej@svn>2010-09-12 09:21:36 +0000
commitd08bf60c13c7f6a273a9ae0cb6c29f3ca0f85157 (patch)
treec1db2a8c7d0c9b3c4b29de1074dd34eca8b582cf
parent3ace79cb888cace46e3944a0dbbd6c4aa19040e8 (diff)
Fix for the RssFeeds.xml not created in portable mode bug. See http://trac.xbmc.org/ticket/10138
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33693 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--xbmc/Application.cpp23
1 files changed, 6 insertions, 17 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index fba8840978..2f4e12774f 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -471,6 +471,12 @@ bool CApplication::Create()
if (!inited)
inited = InitDirectoriesWin32();
+ // copy required files
+ CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
+ CopyUserDataIfNeeded("special://masterprofile/", "favourites.xml");
+ CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
+ CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
+
if (!CLog::Init(_P(g_settings.m_logFolder).c_str()))
{
fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc?\n");
@@ -786,11 +792,6 @@ bool CApplication::InitDirectoriesLinux()
CreateUserDirs();
- // copy required files
- //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml"); // Eventual FIXME.
- CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
}
else
{
@@ -859,12 +860,6 @@ bool CApplication::InitDirectoriesOSX()
g_settings.m_logFolder = strTempPath;
CreateUserDirs();
-
- // copy required files
- //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml"); // Eventual FIXME.
- CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
}
else
{
@@ -922,12 +917,6 @@ bool CApplication::InitDirectoriesWin32()
CreateUserDirs();
- // copy required files
- //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml"); // Eventual FIXME.
- CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "favourites.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
- CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
}
else
{