# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1551960741 -7200
# Node ID e0281dae2cb80319a21599e3c839cea52c3fb487
# Parent  da886b8cbb09bf050d2cc6c9474a1354a88e5af8
Backed out changeset dcca36701cdd

diff -r da886b8cbb09 -r e0281dae2cb8 tools/64vw.c
--- a/tools/64vw.c	Wed Mar 06 10:00:03 2019 +0200
+++ b/tools/64vw.c	Thu Mar 07 14:12:21 2019 +0200
@@ -546,10 +546,17 @@
     // Cleanup
     dmFree(optFilenames);
 
-    SDL_DestroyTexture(texture);
-    SDL_DestroyRenderer(renderer);
-    SDL_DestroyWindow(window);
-    SDL_FreeSurface(surf);
+    if (texture != NULL)
+        SDL_DestroyTexture(texture);
+
+    if (renderer != NULL)
+        SDL_DestroyRenderer(renderer);
+
+    if (window != NULL)
+        SDL_DestroyWindow(window);
+
+    if (surf != NULL)
+        SDL_FreeSurface(surf);
 
     if (initSDL)
         SDL_Quit();
diff -r da886b8cbb09 -r e0281dae2cb8 tools/ppl.c
--- a/tools/ppl.c	Wed Mar 06 10:00:03 2019 +0200
+++ b/tools/ppl.c	Thu Mar 07 14:12:21 2019 +0200
@@ -527,7 +527,8 @@
 
 void dmMuteChannels(BOOL mute)
 {
-    for (int i = 0; i < eng.mod->nchannels; i++)
+    int i;
+    for (i = 0; i < eng.mod->nchannels; i++)
         jvmMute(eng.dev, i, mute);
 }
 
@@ -920,10 +921,17 @@
     }
 
 error_exit:
-    SDL_DestroyTexture(eng.texture);
-    SDL_DestroyRenderer(eng.renderer);
-    SDL_DestroyWindow(eng.window);
-    SDL_FreeSurface(eng.screen);
+    if (eng.texture != NULL)
+        SDL_DestroyTexture(eng.texture);
+
+    if (eng.renderer != NULL)
+        SDL_DestroyRenderer(eng.renderer);
+
+    if (eng.window != NULL)
+        SDL_DestroyWindow(eng.window);
+
+    if (eng.screen != NULL)
+        SDL_FreeSurface(eng.screen);
 
     dmMsg(0, "Audio shutdown.\n");
     if (audioInit)