Skip to content

Avoid crashing when clicking reload #2283

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.

Sign up for GitHub

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

Open
abdelq wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

Avoid crashing when clicking reload #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/laybasic/laybasic/layLayoutViewBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,13 +3282,13 @@ LayoutViewBase::reload_layout (unsigned int cv_index)
handle = new lay::LayoutHandle (new db::Layout (is_editable (), manager ()), filename);
cv.set (handle);

try {
BEGIN_PROTECTED_CLEANUP

// re-create the layers required
for (std::map <unsigned int, db::LayerProperties>::const_iterator ol = org_layers.begin (); ol != org_layers.end (); ++ol) {
cv->layout ().insert_layer (ol->first, ol->second);
}

{
tl::log << tl::to_string (tr ("Loading file: ")) << filename;
tl::SelfTimer timer (tl::verbosity () >= 11, tl::to_string (tr ("Loading")));
Expand Down Expand Up @@ -3320,9 +3320,10 @@ LayoutViewBase::reload_layout (unsigned int cv_index)
cv->rename (name, true);
set_layout (cv, cv_index);

} catch (...) {
END_PROTECTED_CLEANUP
{
update_content ();
throw;
return;
}

// recreate the hidden cell indices from the names
Expand Down
4 changes: 4 additions & 0 deletions src/layview/layview/layLayoutView_qt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ LayoutViewWidget::remove_notification (const LayoutViewNotification &notificatio
void
LayoutViewWidget::notification_action (const LayoutViewNotification &notification, const std::string &action)
{
BEGIN_PROTECTED

if (action == "reload") {

std::string fn = notification.parameter ().to_string ();
Expand All @@ -259,6 +261,8 @@ LayoutViewWidget::notification_action (const LayoutViewNotification &notificatio
remove_notification (notification);

}

END_PROTECTED
}

void
Expand Down