From a069c41b2036a53517880ea6e1004c64d786402b Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Sun, 20 Nov 2016 14:22:26 +0100
Subject: [PATCH] On Windows, load the icon either from the exe, or fron the
 ico file.

---
 lib/Slic3r/GUI/MainFrame.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index 7f09031dc..ca7143e28 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -22,7 +22,10 @@ sub new {
     
     my $self = $class->SUPER::new(undef, -1, $Slic3r::FORK_NAME . ' - ' . $Slic3r::VERSION, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
     if ($^O eq 'MSWin32') {
-        $self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r.ico"), wxBITMAP_TYPE_ICO));
+        # Load the icon either from the exe, or fron the ico file.
+        my $iconfile = $Slic3r::var->('..\slic3r.exe');
+        $iconfile = $Slic3r::var->("Slic3r.ico") unless -f $iconfile;
+        $self->SetIcon(Wx::Icon->new($iconfile, wxBITMAP_TYPE_ICO));
     } else {
         $self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG));        
     }