vitalif
/
Slic3r
mirror of https://github.com/vitalif/Slic3r
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #320 from eras/workaround-gtk 

Fix leaking FileDialog by issuing Destroy to it after it has been used
degen-loop-screen
Alessandro Ranellucci 2012-04-25 03:09:44 -07:00
parent 29b9c31b92 10d4271c01
commit 9a18c00f57
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Slic3r/GUI/SkeinPanel.pm
View File

@ -189,8 +189,12 @@ sub do_slice {
my $input_file; my $input_file;
if (!$params{reslice}) { if (!$params{reslice}) {
my $dialog = Wx::FileDialog->new($self, 'Choose a STL or AMF file to slice:', $dir, "", $model_wildcard, wxFD_OPEN); my $dialog = Wx::FileDialog->new($self, 'Choose a STL or AMF file to slice:', $dir, "", $model_wildcard, wxFD_OPEN);
return unless $dialog->ShowModal == wxID_OK; if ($dialog->ShowModal != wxID_OK) {
$dialog->Destroy;
return;
}
$input_file = $dialog->GetPaths; $input_file = $dialog->GetPaths;
$dialog->Destroy;
$last_input_file = $input_file; $last_input_file = $input_file;
} else { } else {
if (!defined $last_input_file) { if (!defined $last_input_file) {
@ -229,9 +233,13 @@ sub do_slice {
$output_file =~ s/\.gcode$/.svg/i if $params{export_svg}; $output_file =~ s/\.gcode$/.svg/i if $params{export_svg};
my $dlg = Wx::FileDialog->new($self, 'Save ' . ($params{export_svg} ? 'SVG' : 'G-code') . ' file as:', dirname($output_file), my $dlg = Wx::FileDialog->new($self, 'Save ' . ($params{export_svg} ? 'SVG' : 'G-code') . ' file as:', dirname($output_file),
basename($output_file), $gcode_wildcard, wxFD_SAVE); basename($output_file), $gcode_wildcard, wxFD_SAVE);
return if $dlg->ShowModal != wxID_OK; if ($dlg->ShowModal != wxID_OK) {
$dlg->Destroy;
return;
}
$skein->output_file($dlg->GetPath); $skein->output_file($dlg->GetPath);
$last_output_file = $dlg->GetPath; $last_output_file = $dlg->GetPath;
$dlg->Destroy;
} }
# show processbar dialog # show processbar dialog
@ -288,6 +296,7 @@ sub save_config {
$last_config = $file; $last_config = $file;
Slic3r::Config->save($file); Slic3r::Config->save($file);
} }
$dlg->Destroy;
} }
sub load_config { sub load_config {
@ -307,6 +316,7 @@ sub load_config {
$self->catch_error(); $self->catch_error();
$_->() for @Slic3r::GUI::OptionsGroup::reload_callbacks; $_->() for @Slic3r::GUI::OptionsGroup::reload_callbacks;
} }
$dlg->Destroy;
} }
sub catch_error { sub catch_error {