From fc80429b2a1babea55eee988d46933821fbf0243 Mon Sep 17 00:00:00 2001
From: gir489 <poop@fart.com>
Date: Sat, 5 Dec 2020 20:53:58 -0500
Subject: [PATCH] Fixed base tab not properly closing the tab. Updated
 dependencies.

---
 BigBaseV2/src/gui/base_tab.cpp | 2 +-
 BigBaseV2/src/renderer.cpp     | 4 ++--
 premake5.lua                   | 8 +++++---
 vendor/ImGui                   | 2 +-
 vendor/MinHook                 | 2 +-
 vendor/fmtlib                  | 2 +-
 vendor/g3log                   | 2 +-
 vendor/json                    | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/BigBaseV2/src/gui/base_tab.cpp b/BigBaseV2/src/gui/base_tab.cpp
index e3473b31..3ed34db6 100644
--- a/BigBaseV2/src/gui/base_tab.cpp
+++ b/BigBaseV2/src/gui/base_tab.cpp
@@ -82,7 +82,7 @@ namespace big
 			{
 				g_running = false;
 			}
+			ImGui::EndTabItem();
 		}
-		ImGui::EndTabItem();
 	}
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/renderer.cpp b/BigBaseV2/src/renderer.cpp
index f30fdbaf..0310fa8d 100644
--- a/BigBaseV2/src/renderer.cpp
+++ b/BigBaseV2/src/renderer.cpp
@@ -5,8 +5,8 @@
 #include "pointers.hpp"
 #include "renderer.hpp"
 #include <imgui.h>
-#include <imgui_impl_dx11.h>
-#include <imgui_impl_win32.h>
+#include <backends/imgui_impl_dx11.h>
+#include <backends/imgui_impl_win32.h>
 #include <imgui_internal.h>
 
 IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/premake5.lua b/premake5.lua
index 84d4fc4b..2b6154e6 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -44,7 +44,8 @@ workspace "BigBaseV2"
     {
       "4100", -- C4100: unreferenced formal parameter
       "4201", -- C4201: nameless struct/union
-      "4307"  -- C4307: integral constant overflow
+      "4307",  -- C4307: integral constant overflow
+      "4996"  -- C4996: deprecated in C++17
     }
   end
   
@@ -74,9 +75,10 @@ workspace "BigBaseV2"
       "vendor/%{prj.name}/imgui.cpp",
       "vendor/%{prj.name}/imgui_demo.cpp",
       "vendor/%{prj.name}/imgui_draw.cpp",
+      "vendor/%{prj.name}/imgui_tables.cpp",
       "vendor/%{prj.name}/imgui_widgets.cpp",
-      "vendor/%{prj.name}/examples/imgui_impl_dx11.cpp",
-      "vendor/%{prj.name}/examples/imgui_impl_win32.cpp"
+      "vendor/%{prj.name}/backends/imgui_impl_dx11.cpp",
+      "vendor/%{prj.name}/backends/imgui_impl_win32.cpp"
     }
 
     includedirs
diff --git a/vendor/ImGui b/vendor/ImGui
index ec2a24a5..9874077f 160000
--- a/vendor/ImGui
+++ b/vendor/ImGui
@@ -1 +1 @@
-Subproject commit ec2a24a5f13fe8724acda7fc77c3328db6bf076a
+Subproject commit 9874077fc0e364383ef997e3d4332172bfddc0b9
diff --git a/vendor/MinHook b/vendor/MinHook
index 8fda4f54..248aad5d 160000
--- a/vendor/MinHook
+++ b/vendor/MinHook
@@ -1 +1 @@
-Subproject commit 8fda4f5481fed5797dc2651cd91e238e9b3928c6
+Subproject commit 248aad5d9b719e7db264d920837b96e34f9d553b
diff --git a/vendor/fmtlib b/vendor/fmtlib
index 770a94ed..a6fafe2f 160000
--- a/vendor/fmtlib
+++ b/vendor/fmtlib
@@ -1 +1 @@
-Subproject commit 770a94edefd7589f7fbd410346f68f503d988bfe
+Subproject commit a6fafe2f0191cd456d6df66a3071c35c087188a0
diff --git a/vendor/g3log b/vendor/g3log
index 4000c5c8..2fca06ff 160000
--- a/vendor/g3log
+++ b/vendor/g3log
@@ -1 +1 @@
-Subproject commit 4000c5c899c0ae58b8b851f9b66e1a2ac0fe2bff
+Subproject commit 2fca06ff6da5c67465b591f4d45e8fd14d531142
diff --git a/vendor/json b/vendor/json
index 456478b3..350ff4f7 160000
--- a/vendor/json
+++ b/vendor/json
@@ -1 +1 @@
-Subproject commit 456478b3c50d60100dbb1fb9bc931f370a2c1c28
+Subproject commit 350ff4f7ced7c4117eae2fb93df02823c8021fcb