Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Viewer GUI freeze due to DFU and SW update pop ups interference #7493

Merged
merged 1 commit into from
Oct 12, 2020

Conversation

Nir-Az
Copy link
Collaborator

@Nir-Az Nir-Az commented Oct 5, 2020

Both processes try to open a popup modal from the same popup tree level,
ImGui does not support it.

Action taken:

  1. Handle error message during SW update process (Do not allow pop up from inside a pop up)
  2. Display SW update popup only when no other expended notification is being displayed.

Fix issue [RS5-8934]

@Nir-Az Nir-Az changed the title Fix Viewer GUI freeze from DFU and SW update interference [RS5-8934] Fix Viewer GUI freeze due to DFU and SW update pop ups interference [RS5-8934] Oct 5, 2020
@ev-mp ev-mp changed the title Fix Viewer GUI freeze due to DFU and SW update pop ups interference [RS5-8934] Fix Viewer GUI freeze due to DFU and SW update pop ups interference Oct 5, 2020
@Nir-Az Nir-Az force-pushed the viewer_freeze_on_dfu branch from 87c0e1b to a4ac21f Compare October 5, 2020 09:26
@Nir-Az Nir-Az requested a review from ev-mp October 5, 2020 10:35
@Nir-Az Nir-Az requested a review from dorodnic October 6, 2020 13:15
common/viewer.h Outdated
@@ -179,6 +179,7 @@ namespace rs2
bool show_help_screen = false;
bool occlusion_invalidation = true;
bool glsl_available = false;
bool expended_notification_on = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expend -> expand

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call it what it is: modal_notification and if there's confusion: // a notification which was expanded

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

{
bool expended_notification_found = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modal_notification_found

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

// Verify an error window will not pop up. ImGui cannot handle 2 PopUpModals in parallel.
if (!error_message.empty())
{
LOG_ERROR("error catched during update process, details: " + error_message);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

catched -> caught

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@Nir-Az Nir-Az force-pushed the viewer_freeze_on_dfu branch from a4ac21f to 5a71d0e Compare October 11, 2020 11:05
@maloel maloel merged commit ed1c1ef into IntelRealSense:development Oct 12, 2020
@Nir-Az Nir-Az deleted the viewer_freeze_on_dfu branch October 12, 2020 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants