Merge pull request #32 from RaidcoreGG/dev

fix crash
RaidcoreGG · Mar 21, 2024 · 3530360 · 3530360
2 parents 4a89ccb + 1191ad2
commit 3530360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/GUI/GUI.cpp b/src/GUI/GUI.cpp
@@ -462,8 +462,8 @@ namespace GUI
 				ImGui::TextColoredOutlined(ImVec4(1, 0, 0, 1), Language.Translate("((000002))"));
 				ImGui::PopFont();
 
-				ImGui::End();
 			}
+			ImGui::End();
 
 			ImGui::PopStyleVar();
 		}

diff --git a/src/GUI/Widgets/Debug/CDebugWindow.cpp b/src/GUI/Widgets/Debug/CDebugWindow.cpp
@@ -271,8 +271,8 @@ namespace GUI
 					{
 						if (ImGui::TreeNode(identifier.c_str()))
 						{
-							ImGui::TextDisabled("Texture: %p", shortcut.TextureNormal->Resource);
-							ImGui::TextDisabled("Texture (Hover): %p", shortcut.TextureHover->Resource);
+							ImGui::TextDisabled("Texture: %p", shortcut.TextureNormal != nullptr ? shortcut.TextureNormal->Resource : nullptr);
+							ImGui::TextDisabled("Texture (Hover): %p", shortcut.TextureHover != nullptr ? shortcut.TextureHover->Resource : nullptr);
 							ImGui::TextDisabled("OnClick (Keybind): %s", shortcut.Keybind.length() != 0 ? shortcut.Keybind.c_str() : "(null)");
 							ImGui::TextDisabled("Tooltip: %s", shortcut.TooltipText.length() != 0 ? shortcut.TooltipText.c_str() : "(null)");
 							ImGui::TextDisabled("IsHovering: %s", shortcut.IsHovering ? "true" : "false");