|
@@ -1825,6 +1825,11 @@ void ImGui::TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiTable* table = g.CurrentTable;
|
|
|
IM_ASSERT(target != ImGuiTableBgTarget_None);
|
|
|
+ if (table == NULL)
|
|
|
+ {
|
|
|
+ IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
if (color == IM_COL32_DISABLE)
|
|
|
color = 0;
|
|
@@ -2876,9 +2881,7 @@ ImGuiTableSortSpecs* ImGui::TableGetSortSpecs()
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiTable* table = g.CurrentTable;
|
|
|
- IM_ASSERT(table != NULL);
|
|
|
-
|
|
|
- if (!(table->Flags & ImGuiTableFlags_Sortable))
|
|
|
+ if (table == NULL || !(table->Flags & ImGuiTableFlags_Sortable))
|
|
|
return NULL;
|
|
|
|
|
|
// Require layout (in case TableHeadersRow() hasn't been called) as it may alter IsSortSpecsDirty in some paths.
|