3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent crash when user deleted object from plater before thumbnail was generated in the other thread. #1207

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-06-07 13:54:40 +02:00
parent 7a8e1e778a
commit 9ea55497c2
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Slic3r/GUI.pm
View file

@ -253,6 +253,7 @@ sub warning_catcher {
my ($self, $message_dialog) = @_; my ($self, $message_dialog) = @_;
return sub { return sub {
my $message = shift; my $message = shift;
return if $message =~ /GLUquadricObjPtr|Attempt to free unreferenced scalar/;
my @params = ($message, 'Warning', wxOK | wxICON_WARNING); my @params = ($message, 'Warning', wxOK | wxICON_WARNING);
$message_dialog $message_dialog
? $message_dialog->(@params) ? $message_dialog->(@params)

1
lib/Slic3r/GUI/Plater.pm
View file

@ -159,6 +159,7 @@ sub new {
EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub { EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub {
my ($self, $event) = @_; my ($self, $event) = @_;
my ($obj_idx, $thumbnail) = @{$event->GetData}; my ($obj_idx, $thumbnail) = @{$event->GetData};
return if !$self->{objects}[$obj_idx]; # object was deleted before thumbnail generation completed
$self->{objects}[$obj_idx]->thumbnail($thumbnail->clone); $self->{objects}[$obj_idx]->thumbnail($thumbnail->clone);
$self->on_thumbnail_made($obj_idx); $self->on_thumbnail_made($obj_idx);
}); });