From e0c3f4dd82ced0a29d5400982c8ab8fbc8962800 Mon Sep 17 00:00:00 2001 From: nick black Date: Thu, 25 Mar 2021 14:38:35 -0400 Subject: [PATCH] [tabbed] don't explode when destroying 0 tabs --- src/lib/tabbed.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/tabbed.c b/src/lib/tabbed.c index 43c4877f3..207e2026f 100644 --- a/src/lib/tabbed.c +++ b/src/lib/tabbed.c @@ -365,13 +365,13 @@ nctab* nctabbed_select(nctabbed* nt, nctab* t){ void nctabbed_channels(nctabbed* nt, uint64_t* RESTRICT hdrchan, uint64_t* RESTRICT selchan, uint64_t* RESTRICT sepchan){ if(hdrchan){ - memcpy(&nt->opts.hdrchan, hdrchan, sizeof(*hdrchan)); + memcpy(hdrchan, &nt->opts.hdrchan, sizeof(*hdrchan)); } if(selchan){ - memcpy(&nt->opts.selchan, selchan, sizeof(*selchan)); + memcpy(selchan, &nt->opts.selchan, sizeof(*selchan)); } if(sepchan){ - memcpy(&nt->opts.sepchan, sepchan, sizeof(*sepchan)); + memcpy(sepchan, &nt->opts.sepchan, sizeof(*sepchan)); } } @@ -389,7 +389,6 @@ void nctabbed_destroy(nctabbed* nt){ } nctab* t = nt->leftmost; nctab* tmp; - t->prev->next = NULL; while(t){ tmp = t->next; free(t->name);