Use patch instead of RetroFE fork

This commit is contained in:
DrUm78 2024-10-02 17:23:41 +02:00
parent 47a89fe357
commit 85204e25a8
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,37 @@
diff --git a/RetroFE/Source/Collection/CollectionInfo.cpp b/RetroFE/Source/Collection/CollectionInfo.cpp
index 94f8400..3819919 100755
--- a/RetroFE/Source/Collection/CollectionInfo.cpp
+++ b/RetroFE/Source/Collection/CollectionInfo.cpp
@@ -78,8 +78,8 @@ bool CollectionInfo::Save()
bool retval = true;
if(saveRequest)
{
- std::string dir = Utils::combinePath(Configuration::absolutePath, "collections", name, "playlists");
- std::string file = Utils::combinePath(Configuration::absolutePath, "collections", name, "playlists/favorites.txt");
+ std::string dir = Utils::combinePath(Configuration::userPath, "collections", name, "playlists");
+ std::string file = Utils::combinePath(Configuration::userPath, "collections", name, "playlists/favorites.txt");
Logger::write(Logger::ZONE_INFO, "Collection", "Saving " + file);
Utils::rootfsWritable();
diff --git a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
index cd10b10..ff7dcef 100755
--- a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
+++ b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
@@ -379,7 +379,7 @@ void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
DIR *dp;
struct dirent **dirp;
int n;
- std::string path = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "playlists");
+ std::string path = Utils::combinePath(Configuration::userPath, "collections", info->name, "playlists");
dp = opendir(path.c_str());
if(dp == NULL)
@@ -407,7 +407,7 @@ void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
Logger::write(Logger::ZONE_INFO, "RetroFE", "Loading playlist: " + basename);
std::map<std::string, Item *> playlistFilter;
- std::string playlistFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "playlists", file);
+ std::string playlistFile = Utils::combinePath(Configuration::userPath, "collections", info->name, "playlists", file);
ImportBasicList(info, playlistFile, playlistFilter);
info->playlists[basename] = new std::vector<Item *>();

View File

@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
RETROFE_VERSION = v1.1.5-funkey-s RETROFE_VERSION = RetroFE-FunKey-1.1.4
RETROFE_SITE_METHOD = git RETROFE_SITE_METHOD = git
RETROFE_SITE = https://github.com/DrUm78/RetroFE.git RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git
RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib
RETROFE_LICENSE = GPL-3.0 RETROFE_LICENSE = GPL-3.0
RETROFE_LICENSE_FILES = LICENSE.txt RETROFE_LICENSE_FILES = LICENSE.txt