checks types have been initialised

JerboaBurrow · Jan 1, 2024 · be3f75a · be3f75a
1 parent adefaf8
commit be3f75a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,6 +171,8 @@ else()
     target_link_libraries(Hop glew zlibstatic FreeType glm stduuid ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} glfw Lua Miniaudio)
 endif()
 
+add_library(FreeType ALIAS freetype)
+
 add_subdirectory(tools/)
 
 IF (BUILD_DEMOS)

diff --git a/demo/desktop/perlinWorld/sfml/CMakeLists.txt b/demo/desktop/perlinWorld/sfml/CMakeLists.txt
@@ -23,8 +23,6 @@ set(CMAKE_MODULE_PATH ../../include/SFML-2.5.1/cmake)
 
 # graphics for sf::RenderWindow (window is in sfml-window)
 
-add_library(FreeType ALIAS freetype)
-
 find_package(SFML 2.5.1 COMPONENTS graphics REQUIRED)
 
 add_executable(${OUTPUT_NAME}

diff --git a/demo/desktop/softBodyTetris/sfml/CMakeLists.txt b/demo/desktop/softBodyTetris/sfml/CMakeLists.txt
@@ -24,8 +24,6 @@ set(CMAKE_MODULE_PATH ../../include/SFML-2.5.1/cmake)
 
 # graphics for sf::RenderWindow (window is in sfml-window)
 
-add_library(FreeType ALIAS freetype)
-
 find_package(SFML 2.5.1 COMPONENTS graphics REQUIRED)
 
 add_executable(${OUTPUT_NAME}

diff --git a/include/System/Sound/sSound.h b/include/System/Sound/sSound.h
@@ -43,8 +43,8 @@ namespace Hop::System::Sound
         ~sSound()
         {
             ma_engine_uninit(&engine);
-            ma_device_uninit(&device);
-            ma_decoder_uninit(&decoder);
+            if (deviceInUse) { ma_device_uninit(&device); }
+            if (decoderInUse != DECODER::NONE) { ma_decoder_uninit(&decoder); }
         }
 
         ma_result decode(std::string file)
@@ -115,6 +115,7 @@ namespace Hop::System::Sound
                 }
 
                 ma_device_init(NULL, &config, &device);
+                deviceInUse = true;
 
                 ma_device_start(&device);
                 looping = true;
@@ -145,6 +146,7 @@ namespace Hop::System::Sound
         bool looping = false;
 
         DECODER decoderInUse = DECODER::NONE;
+        bool deviceInUse = false;
 
         ma_decoding_backend_vtable* pCustomBackendVTables[1] =
         {