mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1762 from azuline/sortctx 

restore sort function pointers when restoring cfg
This commit is contained in:
Arun 2023-11-19 13:39:24 +05:30 committed by GitHub
parent 9259170afd c0b3cc8689
commit 744a7554ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nnn.c
View File

@ -4276,6 +4276,18 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
addch(ind); addch(ind);
} }
/**
* Sets the global cfg variable and restores related state to match the new
* cfg.
*/
static void setcfg(settings newcfg)
{
cfg = newcfg;
/* Synchronize the global function pointers to match the new cfg. */
entrycmpfn = cfg.reverse ? &reventrycmp : &entrycmp;
namecmpfn = cfg.version ? &xstrverscasecmp : &xstricmp;
}
static void savecurctx(char *path, char *curname, int nextctx) static void savecurctx(char *path, char *curname, int nextctx)
{ {
settings tmpcfg = cfg; settings tmpcfg = cfg;
@ -4307,7 +4319,7 @@ static void savecurctx(char *path, char *curname, int nextctx)
} }
tmpcfg.curctx = nextctx; tmpcfg.curctx = nextctx;
cfg = tmpcfg; setcfg(tmpcfg);
} }
#ifndef NOSSN #ifndef NOSSN
@ -6248,11 +6260,9 @@ static int set_sort_flags(int r)
r = 'd'; r = 'd';
} }
if (cfg.version) /* Ensure function pointers are in sync with cfg. */
namecmpfn = &xstrverscasecmp; entrycmpfn = cfg.reverse ? &reventrycmp : &entrycmp;
namecmpfn = cfg.version ? &xstrverscasecmp : &xstricmp;
if (cfg.reverse)
entrycmpfn = &reventrycmp;
} else if (r == CONTROL('T')) { } else if (r == CONTROL('T')) {
/* Cycling order: clear -> size -> time -> clear */ /* Cycling order: clear -> size -> time -> clear */
if (cfg.timeorder) if (cfg.timeorder)
@ -8017,9 +8027,9 @@ nochange:
lastdir = g_ctx[r].c_last; lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name; lastname = g_ctx[r].c_name;
cfg = g_ctx[r].c_cfg; g_ctx[r].c_cfg.curctx = r;
setcfg(g_ctx[r].c_cfg);
cfg.curctx = r;
setdirwatch(); setdirwatch();
goto begin; goto begin;
} }