From 10d4271c018e2d4b3c03b8c1014b20533e9965e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <flux@modeemi.fi>
Date: Wed, 18 Apr 2012 17:16:01 +0300
Subject: [PATCH] Fix leaking FileDialog by issuing Destroy to it after it has
been used
This also works around the bug in GTK in its file system tracking/file
open dialog that causes a crash when a file (in a directory it is tracking,
such as the previous directry where an STL was sliced from) is modified
with vim.
Steps to reproduce the bug:
1) Slice a file from the GUI
2) vim test.stl in the same directory
3) i hello ESC ZZ
4) if Slic3r didn't crash to a gtk assertion failure, jump to step 2
5) if still no luck, your gtk isn't broken. What version do you have?-)
---
lib/Slic3r/GUI/SkeinPanel.pm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index 5eb28969d..5f7eff210 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -189,8 +189,12 @@ sub do_slice {
my $input_file;
if (!$params{reslice}) {
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;
+ $dialog->Destroy;
$last_input_file = $input_file;
} else {
if (!defined $last_input_file) {
@@ -229,9 +233,13 @@ sub do_slice {
$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),
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);
$last_output_file = $dlg->GetPath;
+ $dlg->Destroy;
}
# show processbar dialog
@@ -288,6 +296,7 @@ sub save_config {
$last_config = $file;
Slic3r::Config->save($file);
}
+ $dlg->Destroy;
}
sub load_config {
@@ -307,6 +316,7 @@ sub load_config {
$self->catch_error();
$_->() for @Slic3r::GUI::OptionsGroup::reload_callbacks;
}
+ $dlg->Destroy;
}
sub catch_error {