Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-10-31 15:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncplane_move bugfix when already in desired config

Browse Source
This commit is contained in:
nick black 2020-01-15 18:54:52 -05:00 committed by Nick Black
parent 08f6fa0e79
commit 2783a1b503
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/notcurses.c
View File

@ -504,7 +504,7 @@ find_above_ncplane(ncplane* n){
if(*above == n){
return above;
}
above = &(*above)->z;
above = &((*above)->z);
}
return NULL;
}
@ -517,13 +517,12 @@ int ncplane_destroy(ncplane* ncp){
return -1;
}
ncplane** above = find_above_ncplane(ncp);
if(*above){
*above = ncp->z; // splice it out of the list
free_plane(ncp);
return 0;
if(above == NULL){
return -1;
}
// couldn't find it in our stack. don't try to free this interloper.
return -1;
*above = ncp->z; // splice it out of the list
free_plane(ncp);
return 0;
}
static int
@ -1037,6 +1036,9 @@ advance_cursor(ncplane* n, int cols){
// 'n' ends up above 'above'
int ncplane_move_above_unsafe(ncplane* restrict n, ncplane* restrict above){
if(n->z == above){
return 0;
}
ncplane** an = find_above_ncplane(n);
if(an == NULL){
return -1;
@ -1053,6 +1055,9 @@ int ncplane_move_above_unsafe(ncplane* restrict n, ncplane* restrict above){
// 'n' ends up below 'below'
int ncplane_move_below_unsafe(ncplane* restrict n, ncplane* restrict below){
if(below->z == n){
return 0;
}
ncplane** an = find_above_ncplane(n);
if(an == NULL){
return -1;