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
FernetMenta · Sep 12, 2010 · d08bf60 · d08bf60
1 parent 3ace79c
commit d08bf60
Showing 1 changed file with 6 additions and 17 deletions.
diff --git 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
   {