-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
Fix Viewer GUI freeze due to DFU and SW update pop ups interference #7493
Conversation
87c0e1b
to
a4ac21f
Compare
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; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expend -> expand
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
common/notifications.cpp
Outdated
{ | ||
bool expended_notification_found = false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modal_notification_found
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
common/updates-model.cpp
Outdated
// 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); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
catched
-> caught
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
a4ac21f
to
5a71d0e
Compare
Both processes try to open a popup modal from the same popup tree level,
ImGui does not support it.
Action taken:
Fix issue [RS5-8934]