EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdraw: gengetwindow() fix mistake 

dont zero *winp so the "screen" pointer is preserved.
front
cinap_lenrek 2013-01-11 23:18:22 +01:00
parent 23b189c2bc
commit a426c08ce2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/src/libdraw/init.c
View File

@ -147,13 +147,6 @@ retry:
}else{
close(fd);
buf[n] = '\0';
if(*winp != nil){
_freeimage1(*winp);
*winp = nil;
freeimage((*scrp)->image);
freescreen(*scrp);
*scrp = nil;
}
image = namedimage(d, buf);
if(image == 0){
/*
@ -166,6 +159,14 @@ retry:
goto retry;
}
fprint(2, "namedimage %s failed: %r\n", buf);
}
if(*winp != nil){
_freeimage1(*winp);
freeimage((*scrp)->image);
freescreen(*scrp);
*scrp = nil;
}
if(image == 0){
*winp = nil;
d->screenimage = nil;
return -1;
@ -176,9 +177,9 @@ retry:
d->screenimage = image;
*scrp = allocscreen(image, d->white, 0);
if(*scrp == nil){
freeimage(d->screenimage);
*winp = nil;
d->screenimage = nil;
freeimage(image);
return -1;
}
@ -189,12 +190,12 @@ retry:
if(*winp == nil){
freescreen(*scrp);
*scrp = nil;
freeimage(image);
d->screenimage = nil;
freeimage(image);
return -1;
}
d->screenimage = *winp;
assert((*winp)->chan != 0);
d->screenimage = *winp;
return 1;
}