From 0d6d69c47a7af5b9d12d05f289da055cdd95933c Mon Sep 17 00:00:00 2001
From: Inori <strix@struma.me>
Date: Wed, 23 Oct 2019 02:20:06 -0400
Subject: [PATCH] Suppress warnings left over from original project

---
 meson.build  | 3 +++
 src/main.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e8967046..b0fbe2a0 100644
--- a/meson.build
+++ b/meson.build
@@ -64,6 +64,9 @@ include_dirs = [include_directories('src', 'binding')]
 all_sources += files('cwalk/src/cwalk.c')
 include_dirs += include_directories('cwalk/include')
 
+# Disable some warnings
+add_project_arguments(['-Wno-undefined-var-template', '-Wno-non-virtual-dtor', '-Wno-uninitialized'], language: 'cpp')
+
 
 linker_args = []
 
diff --git a/src/main.cpp b/src/main.cpp
index 5a6781d6..c925af03 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
 		                         rtData.rgssErrorMsg.c_str(), win);
 	}
     
-    SDL_GL_DeleteContext(rtData.glContext);
+    if (rtData.glContext) SDL_GL_DeleteContext(rtData.glContext);
 
 	/* Clean up any remainin events */
 	eventThread.cleanup();