X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=6e24d71b13a42df36a0f2f23b5442dc3406f28a1;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=bc9185672d13b5cb070333857e5a37c90143f6df;hpb=878faa0c9283ee1e6e5e67b6ea1324cc52385742;p=libs%2Fgltk.git

diff --git a/source/image.cpp b/source/image.cpp
index bc91856..6e24d71 100644
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -11,10 +11,8 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-	image(i),
-	keep_aspect(true)
-{
-}
+	image(i)
+{ }
 
 void Image::autosize_special(const Part &part, Geometry &ageom) const
 {
@@ -56,22 +54,18 @@ void Image::set_keep_aspect(bool ka)
 
 void Image::update_icon()
 {
-	if(style)
-	{
-		Root *root = find_ancestor<Root>();
-		if(root)
-		{
-			if(icon_name.empty())
-				image = 0;
-			else
-				image = &root->get_resources().get<GL::Texture2D>(icon_name);
-			signal_autosize_changed.emit();
-			mark_rebuild();
-			return;
-		}
-	}
+	image = nullptr;
+	if(!style)
+		return;
+
+	Root *root = find_ancestor<Root>();
+	if(!root)
+		return;
 
-	image = 0;
+	if(!icon_name.empty())
+		image = &root->get_resources().get<GL::Texture2D>(icon_name);
+	signal_autosize_changed.emit();
+	mark_rebuild();
 }
 
 void Image::rebuild_special(const Part &part)