diff options
| author |  jonas <himself@jonasgunz.de>
| 2019-01-06 16:33:36 +0100 |
|---|---|---|
| committer | jonas <himself@jonasgunz.de>
| 2019-01-06 16:33:36 +0100 |
| commit | 1751c781621b644eda4bd2ebd8eb73fa2270e98e (patch) | |
| tree | ad3551ec75c3959b98d2c5ee3271615d99ed0835 | |
| parent | 4912eb6946734a540a81cef97bcf0d418b73406f (diff) | |
| download | termgl-1751c781621b644eda4bd2ebd8eb73fa2270e98e.tar.gz | |
Fixed double-free on exit
added make all
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | cObject.cpp | 3 | ||||
| -rw-r--r-- | cRender.cpp | 5 |
3 files changed, 10 insertions, 2 deletions
@@ -11,6 +11,10 @@ prog: $(OBJ) %.o: %.cpp $(CC) $(CFLAGS) -c $< +all: + make clean + make + .PHONY: clean clean: diff --git a/cObject.cpp b/cObject.cpp index b293745..118fe6f 100644 --- a/cObject.cpp +++ b/cObject.cpp @@ -3,7 +3,6 @@ cObject::cObject(int _sx, int _sy) { bSizeSet = false; - bBlockRender = true; //Block inherited render capabilities of parent setSize(_sx, _sy); } @@ -47,6 +46,8 @@ void cObject::setSize(int _sx, int _sy) if(bSizeSet) return; + bBlockRender = true; //Block inherited render capabilities of parent + sizeX = _sx; sizeY = _sy; diff --git a/cRender.cpp b/cRender.cpp index 6d7a70a..d4f4185 100644 --- a/cRender.cpp +++ b/cRender.cpp @@ -47,6 +47,9 @@ cRender::cRender() {} cRender::~cRender() { //Free allocated memory + if(bBlockRender) + return; + for (int i = 0; i < sizeX; i++) { free(cScreen[i]); free(wColor[i]); @@ -58,7 +61,7 @@ cRender::~cRender() free(bChanged); setConsoleEcho(true); - + #ifdef __linux__ setConsoleCursor(true); #endif |