2 files changed, 9 insertions, 2 deletions
diff --git a/glcddrivers/image.c b/glcddrivers/image.c
index 9c71006..a07ce54 100644
--- a/glcddrivers/image.c
+++ b/glcddrivers/image.c
@@ -30,6 +30,7 @@ cDriverImage::cDriverImage(cDriverConfig * config)
 
 cDriverImage::~cDriverImage()
 {
+    DeInit();
     delete oldConfig;
 }
 
@@ -71,9 +72,15 @@ int cDriverImage::Init()
 int cDriverImage::DeInit()
 {
     if (newLCD)
+    {
         delete[] newLCD;
+        newLCD = 0;
+    }
     if (oldLCD)
+    {
         delete[] oldLCD;
+        oldLCD = 0;
+    }
     return 0;
 }
 
diff --git a/glcddrivers/noritake800.c b/glcddrivers/noritake800.c
index b1c5718..89ae898 100644
--- a/glcddrivers/noritake800.c
+++ b/glcddrivers/noritake800.c
@@ -170,13 +170,13 @@ cDriverNoritake800::~cDriverNoritake800()
     int x;
 
     if (m_pVFDMem)
-        for (x = 0; x < (width + 7) / 8; x++)
+        for (x = 0; x < width; x++)
         {
             delete[] m_pVFDMem[x];
         }
     delete[] m_pVFDMem;
     if (m_pDrawMem)
-        for (x = 0; x < (width + 7) / 8; x++)
+        for (x = 0; x < width; x++)
         {
             delete[] m_pDrawMem[x];
         }