Added patch to fix upstream issue 1077

This commit is contained in:
Miro Hrončok 2013-04-23 14:29:10 +02:00
parent 5429fab710
commit 59be9374b1
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From b725847a5131f5dc7e82a7eeda1783e9287580ea Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 3 Apr 2013 19:26:59 +0200
Subject: [PATCH] Bugfix: configuration wizard led to crash with simple mode.
#1077
---
lib/Slic3r/GUI/SkeinPanel.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index ef74033..1bcaa4d 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -243,7 +243,9 @@ sub config_wizard {
return unless $self->check_unsaved_changes;
if (my $config = Slic3r::GUI::ConfigWizard->new($self)->run) {
- $_->select_default_preset for values %{$self->{options_tabs}};
+ if ($self->{mode} eq 'expert') {
+ $_->select_default_preset for values %{$self->{options_tabs}};
+ }
$self->load_config($config);
}
}
--
1.8.1.6

View File

@ -1,6 +1,6 @@
Name: slic3r
Version: 0.9.9
Release: 1%{?dist}
Release: 2%{?dist}
Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
License: AGPLv3 and CC-BY
# Images are CC-BY, code is AGPLv3
@ -17,6 +17,9 @@ Patch0: %{name}-datadir.patch
# Reasons are a bit complicated and are described in the patch
Patch1: %{name}-english-locale.patch
# https://github.com/alexrj/Slic3r/issues/1077
Patch2: %{name}-config-wizard-crash-fix.patch
Source1: %{name}.desktop
BuildArch: noarch
BuildRequires: perl(Boost::Geometry::Utils) >= 0.06
@ -63,6 +66,7 @@ for more information.
%setup -qn Slic3r-%{commit}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
@ -95,6 +99,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{_mandir}/man3/*
%changelog
* Tue Apr 23 2013 Miro Hrončok <mhroncok@redhat.com> - 0.9.9-2
- Added patch to fix upstream issue 1077
* Wed Apr 03 2013 Miro Hrončok <mhroncok@redhat.com> - 0.9.9-1
- New upstream release
- Added version to perl(Boost::Geometry::Utils) BR