fix: free used textures

pathway27 · Feb 18, 2018 · 2f2ef6b · 2f2ef6b
1 parent 4582322
commit 2f2ef6b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/bklayervita.cpp b/src/bklayervita.cpp
@@ -89,14 +89,15 @@ void BKLayer::load() {
 }
 
 void BKLayer::unload(){
-  // bad crash if i do these?
-  // delete texLogo;
-  // delete bk_memory_icon;
-  // delete bk_battery_icon;
-  // delete bk_clock_icon;
-  // delete bk_circle_icon;
-  // delete bk_cross_icon;
-  // delete fontBig;
+  // do i need to do this?
+  // crashes if i do...
+  texLogo->release();
+  bk_memory_icon->release();
+  bk_battery_icon->release();
+  bk_clock_icon->release();
+  bk_circle_icon->release();
+  bk_cross_icon->release();
+  fontBig->release();
 }
 
 void BKLayer::drawImage(int x, int y) {

diff --git a/src/bookr.cpp b/src/bookr.cpp
@@ -263,8 +263,9 @@ int main(int argc, char* argv[]) {
     #endif
   }
 
-#ifdef DEBUG
-#endif
+  #ifdef DEBUG
+    printf("exiting...\n");
+  #endif
 
   // Get rid of all gui layers
   bkLayersIt it(layers.begin());
@@ -275,8 +276,8 @@ int main(int argc, char* argv[]) {
   }
   layers.clear();
 
-  BKLayer::unload();
   FZScreen::close();
+  BKLayer::unload();
   FZScreen::exit();
 
   return 0;

diff --git a/src/graphics/fztexture.cpp b/src/graphics/fztexture.cpp
@@ -58,13 +58,11 @@
       #ifdef DEBUG
         printf("~FZTexture\n");
       #endif
-      if (texImage)
-          texImage->release();
-      texImage = NULL;
 
-      if (vita_texture)
-          vita2d_free_texture(vita_texture);
-      vita_texture = NULL;
+      if (vita_texture != NULL) {
+        vita2d_free_texture(vita_texture);
+        vita_texture = NULL;
+      }
   }
 
   void FZTexture::bind() {