Skip to content

Commit

Permalink
don't look for local options file
Browse files Browse the repository at this point in the history
Don't load ./.get_iplayer/options. Avoids unwanted side effects if
using --profile-dir when working in home directory
  • Loading branch information
dinkypumpkin authored and notnac committed Dec 19, 2018
1 parent 2e205b0 commit 361bb01
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions get_iplayer
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,8 @@ logger "DEBUG: User preset options file: $optfile_preset\n" if defined $optfile_
# Parse options if we're not saving/adding/deleting options (system-wide options are overridden by personal options)
if ( ! ( $opt_pre->{prefsadd} || $opt_pre->{prefsdel} || $opt_pre->{prefsclear} ) ) {
# Load options from files into $opt_file
# system, Default, './.get_iplayer/options' and Preset options in that order should they exist
my $optfile_local = File::Spec->catfile('.', '.get_iplayer', 'options');
$opt_file->load( $opt, $optfile_system, $optfile_default, $optfile_local, $optfile_preset );
# system, default and preset options in that order should they exist
$opt_file->load( $opt, $optfile_system, $optfile_default, $optfile_preset );
# Copy these loaded options into $opt
$opt->copy_set_options_from( $opt_file );
}
Expand Down

0 comments on commit 361bb01

Please sign in to comment.