Operations on option values need to be performed after they are read. Fixes 843161d96e.
Unified · Split
| @@ -131,12 +131,10 @@ local function split_option_exts(video, audio, image) · 130 unmodified lines | |||
| 131 | if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end | 131 | if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end |
| 132 | if image then o.additional_image_exts = Split(o.additional_image_exts) end | 132 | if image then o.additional_image_exts = Split(o.additional_image_exts) end |
| 133 | end | 133 | end |
| 134 | split_option_exts(true, true, true) | ||
| 135 | 134 | ||
| 136 | local function split_patterns() | 135 | local function split_patterns() |
| 137 | o.ignore_patterns = Split(o.ignore_patterns) | 136 | o.ignore_patterns = Split(o.ignore_patterns) |
| 138 | end | 137 | end |
| 139 | split_patterns() | ||
| 140 | 138 | ||
| 141 | local function create_extensions() | 139 | local function create_extensions() |
| 142 | if o.videos then | 140 | if o.videos then |
| @@ -152,7 +150,6 @@ local function create_extensions() · 9 unmodified lines | |||
| 152 | SetUnion(EXTENSIONS, EXTENSIONS_IMAGES) | 150 | SetUnion(EXTENSIONS, EXTENSIONS_IMAGES) |
| 153 | end | 151 | end |
| 154 | end | 152 | end |
| 155 | create_extensions() | ||
| 156 | 153 | ||
| 157 | local function validate_directory_mode() | 154 | local function validate_directory_mode() |
| 158 | if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy" | 155 | if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy" |
| @@ -160,7 +157,6 @@ local function validate_directory_mode() · 1 unmodified line | |||
| 160 | o.directory_mode = nil | 157 | o.directory_mode = nil |
| 161 | end | 158 | end |
| 162 | end | 159 | end |
| 163 | validate_directory_mode() | ||
| 164 | 160 | ||
| 165 | options.read_options(o, nil, function(list) | 161 | options.read_options(o, nil, function(list) |
| 166 | split_option_exts(list.additional_video_exts, list.additional_audio_exts, | 162 | split_option_exts(list.additional_video_exts, list.additional_audio_exts, |
| @@ -175,6 +171,11 @@ options.read_options(o, nil, function(list) · 8 unmodified lines | |||
| 175 | end | 171 | end |
| 176 | end) | 172 | end) |
| 177 | 173 | ||
| 174 | split_option_exts(true, true, true) | ||
| 175 | split_patterns() | ||
| 176 | create_extensions() | ||
| 177 | validate_directory_mode() | ||
| 178 | |||
| 178 | local function add_files(files) | 179 | local function add_files(files) |
| 179 | local oldcount = mp.get_property_number("playlist-count", 1) | 180 | local oldcount = mp.get_property_number("playlist-count", 1) |
| 180 | for i = 1, #files do | 181 | for i = 1, #files do |