History

TOOLS/autoload.lua: fix directory_mode and ext options

Operations on option values need to be performed after they are read. Fixes 843161d96e.

Guido Cella committed 2 years ago

Commit e95af5b1 parent cfc651a1 file · +5 −4Browse files

Unified · Split

TOOLS/lua/autoload.lua+5−4
@@ -131,12 +131,10 @@ local function split_option_exts(video, audio, image) · 130 unmodified lines
131131 if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end
132132 if image then o.additional_image_exts = Split(o.additional_image_exts) end
133133 end
134−split_option_exts(true, true, true)
135134
136135 local function split_patterns()
137136 o.ignore_patterns = Split(o.ignore_patterns)
138137 end
139−split_patterns()
140138
141139 local function create_extensions()
142140 if o.videos then
@@ -152,7 +150,6 @@ local function create_extensions() · 9 unmodified lines
152150 SetUnion(EXTENSIONS, EXTENSIONS_IMAGES)
153151 end
154152 end
155−create_extensions()
156153
157154 local function validate_directory_mode()
158155 if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy"
@@ -160,7 +157,6 @@ local function validate_directory_mode() · 1 unmodified line
160157 o.directory_mode = nil
161158 end
162159 end
163−validate_directory_mode()
164160
165161 options.read_options(o, nil, function(list)
166162 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
175171 end
176172 end)
177173
174+split_option_exts(true, true, true)
175+split_patterns()
176+create_extensions()
177+validate_directory_mode()
178+
178179 local function add_files(files)
179180 local oldcount = mp.get_property_number("playlist-count", 1)
180181 for i = 1, #files do

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t