Project

General

Profile

patchbug732.diff

diffs - Jim Turner, September 16, 2017 04:05

View differences:

libaudcore/adder.cc 2017-09-15 20:16:47.625488688 -0500
283 283
static void add_folder (const char * filename, PlaylistFilterFunc filter,
284 284
 void * user, AddResult * result, bool save_title)
285 285
{
286
    bool nosubdirs = aud_get_bool (nullptr, "no_subdirs");
287

  
286 288
    AUDINFO ("Adding folder: %s\n", filename);
287 289
    status_update (filename, result->items.len ());
288 290

  
......
327 329

  
328 330
        if (mode & VFS_IS_REGULAR)
329 331
            add_file ({String (file)}, filter, user, result, true);
330
        else if (mode & VFS_IS_DIR)
332
        else if (! nosubdirs && (mode & VFS_IS_DIR))
331 333
            add_folder (file, filter, user, result, false);
332 334
    }
333 335
}
334
-- libaudgui/prefs-window.cc.v3.83f	2017-06-07 11:42:49.000000000 -0500
336
++ libaudgui/prefs-window.cc	2017-09-15 20:38:34.476406108 -0500
......
302 302
        WidgetBool (0, "clear_playlist")),
303 303
    WidgetCheck (N_("Open files in a temporary playlist"),
304 304
        WidgetBool (0, "open_to_temporary")),
305
    WidgetCheck (N_("Do not load files from subfolders"),
306
        WidgetBool (0, "no_subdirs")),
305 307
    WidgetLabel (N_("<b>Song Display</b>")),
306 308
    WidgetCheck (N_("Show song numbers"),
307 309
        WidgetBool (0, "show_numbers_in_pl", send_title_change)),
308
-- libaudqt/prefs-window.cc.v3.83f	2017-06-07 12:03:19.000000000 -0500
310
++ libaudqt/prefs-window.cc	2017-09-15 20:44:22.020384146 -0500
......
336 336
        WidgetBool (0, "clear_playlist")),
337 337
    WidgetCheck (N_("Open files in a temporary playlist"),
338 338
        WidgetBool (0, "open_to_temporary")),
339
    WidgetCheck (N_("Do not load files from subfolders"),
340
        WidgetBool (0, "no_subdirs")),
339 341
    WidgetLabel (N_("<b>Song Display</b>")),
340 342
    WidgetCheck (N_("Show song numbers"),
341 343
        WidgetBool (0, "show_numbers_in_pl", send_title_change)),