Merge commit 'upstream/0.4.1'

1 files changed, 7 insertions, 3 deletions

diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala
index 022e44b..933919b 100644
--- a/src/gui/preferencesWindow.vala
+++ b/src/gui/preferencesWindow.vala
@@ -129,6 +129,11 @@ public class PreferencesWindow : GLib.Object {
                 // save settings on close
                 Config.global.save();
                 Pies.save();
+                
+                Timeout.add(100, () => {
+                    IconSelectWindow.clear_icons();
+                    return false;
+                });
             });
             
             this.window.delete_event.connect(this.window.hide_on_delete);
@@ -181,9 +186,7 @@ public class PreferencesWindow : GLib.Object {
             if (pie.icon.contains("/"))
                 try {
                     this.icon.pixbuf = new Gdk.Pixbuf.from_file_at_scale(pie.icon, 
-                                                                         this.icon.get_pixel_size(), 
-                                                                         this.icon.get_pixel_size(), 
-                                                                         true);
+                                            this.icon.get_pixel_size(), this.icon.get_pixel_size(), true);
                 } catch (GLib.Error error) {
                     warning(error.message);
                 }
@@ -305,6 +308,7 @@ public class PreferencesWindow : GLib.Object {
         }
         
         this.icon_window.show();
+        this.icon_window.set_icon(PieManager.all_pies[selected_id].icon);
     }
 }