Skip to content

Commit

Permalink
Revert "Merge pull request CleverRaven#72074 from katemonster33/imgui…
Browse files Browse the repository at this point in the history
…_draw_debug_error_crash"

This reverts commit c364b31, reversing
changes made to 0aff7d5.
  • Loading branch information
SurFlurer committed Mar 19, 2024
1 parent e4fab9a commit 98c37e8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/ui_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@

using ui_stack_t = std::vector<std::reference_wrapper<ui_adaptor>>;

#if !defined(__ANDROID__)
static bool imgui_frame_started = false;
#endif
static bool redraw_in_progress = false;
static bool showing_debug_message = false;
static bool restart_redrawing = false;
Expand Down Expand Up @@ -344,11 +341,7 @@ void ui_adaptor::redraw_invalidated( )
return;
}
#if !defined(__ANDROID__)
// This boolean is needed when a debug error is thrown inside redraw_invalidated
if( !imgui_frame_started ) {
imclient->new_frame();
}
imgui_frame_started = true;
imclient->new_frame();
#endif

restore_on_out_of_scope<bool> prev_redraw_in_progress( redraw_in_progress );
Expand Down Expand Up @@ -457,7 +450,6 @@ void ui_adaptor::redraw_invalidated( )

#if !defined(__ANDROID__)
imclient->end_frame();
imgui_frame_started = false;
#endif
}

Expand Down

0 comments on commit 98c37e8

Please sign in to comment.