Skip to content
Snippets Groups Projects
Commit e383b11c authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix: File Areas... Clone Settings was always cloning settings to first library

The directories of the *first* library was always the target of the (new)
"Clone Settings" option. We're using a dir_t for each lib's dir_defaults, but
that doesn't mean the dir_defaults.lib is initialized to a correct libnum
(it's not), so don't use it.
parent 777fb6d8
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #4499 passed
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define CUT_LIBNUM USHRT_MAX #define CUT_LIBNUM USHRT_MAX
#define ADDFILES_HELP "Help adding files to directories, see `http://wiki.synchro.net/faq:files`" #define ADDFILES_HELP "Help adding files to directories, see `http://wiki.synchro.net/faq:files`"
void dir_defaults_cfg(dir_t*); void dir_defaults_cfg(int libnum);
char* file_sort_desc[] = { char* file_sort_desc[] = {
"Name Ascending (case-insensitive)", "Name Ascending (case-insensitive)",
...@@ -1061,7 +1061,7 @@ void xfer_cfg() ...@@ -1061,7 +1061,7 @@ void xfer_cfg()
break; break;
case __COUNTER__: case __COUNTER__:
dir_defaults_cfg(&cfg.lib[libnum]->dir_defaults); dir_defaults_cfg(libnum);
break; break;
case __COUNTER__: case __COUNTER__:
...@@ -2118,10 +2118,11 @@ void dir_cfg(int libnum) ...@@ -2118,10 +2118,11 @@ void dir_cfg(int libnum)
} }
} }
void dir_defaults_cfg(dir_t* dir) void dir_defaults_cfg(int libnum)
{ {
static int dflt; static int dflt;
char str[128]; char str[128];
dir_t* dir = &cfg.lib[libnum]->dir_defaults;
while(1) { while(1) {
int n = 0; int n = 0;
...@@ -2235,7 +2236,7 @@ void dir_defaults_cfg(dir_t* dir) ...@@ -2235,7 +2236,7 @@ void dir_defaults_cfg(dir_t* dir)
,uifcYesNoOpts); ,uifcYesNoOpts);
if(n==0) { if(n==0) {
for(int j=0;j<cfg.total_dirs;j++) { for(int j=0;j<cfg.total_dirs;j++) {
if(cfg.dir[j]->lib != dir->lib) if(cfg.dir[j]->lib != libnum)
continue; continue;
uifc.changes=1; uifc.changes=1;
cfg.dir[j]->misc = dir->misc; cfg.dir[j]->misc = dir->misc;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment