TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use RAII to remove temporary PHYSFS search path

Browse source
This commit is contained in:
Kp 2016-08-06 19:55:25 +00:00
parent a09dce6ead
commit 5b71faacda
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/arch/sdl/jukebox.cpp
View file

@ -193,7 +193,15 @@ void jukebox_load()
read_m3u();
else // a directory
{
int new_path = 0;
class PHYSFS_path_deleter
{
public:
void operator()(const char *const p) const noexcept
{
PHYSFS_removeFromSearchPath(p);
}
};
std::unique_ptr<const char, PHYSFS_path_deleter> new_path;
const char *sep = PHYSFS_getDirSeparator();
size_t seplen = strlen(sep);
@ -211,7 +219,8 @@ void jukebox_load()
JukeboxSongs.list.reset(PHYSFSX_findFiles(p, jukebox_exts));
else
{
new_path = PHYSFSX_isNewPath(p);
if (PHYSFSX_isNewPath(p))
new_path.reset(p);
PHYSFS_addToSearchPath(p, 0);
// as mountpoints are no option (yet), make sure only files originating from GameCfg.CMLevelMusicPath are aded to the list.
@ -220,14 +229,9 @@ void jukebox_load()
if (!JukeboxSongs.list)
{
if (new_path)
PHYSFS_removeFromSearchPath(p);
return;
}
JukeboxSongs.num_songs = std::distance(JukeboxSongs.list.begin(), JukeboxSongs.list.end());
if (new_path)
PHYSFS_removeFromSearchPath(p);
}
if (JukeboxSongs.num_songs)