summaryrefslogtreecommitdiff
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2016-03-30 20:27:51 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2016-03-30 20:27:51 +0200
commit74ca5ddcb486a3bf66e4dca65782b2175ca88433 (patch)
tree6c0ca58804371338d307c2967350974364f3c2c7
parentb67c6cb27fbeea70156f3d72b86a29f1c85883e6 (diff)
IconRenderer: don't try reload textures on theme changes if none has ever loaded
(bzr r4093.2.8)
-rw-r--r--unity-shared/IconRenderer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/unity-shared/IconRenderer.cpp b/unity-shared/IconRenderer.cpp
index 296228043..7d0eb215a 100644
--- a/unity-shared/IconRenderer.cpp
+++ b/unity-shared/IconRenderer.cpp
@@ -251,7 +251,8 @@ struct IconRenderer::LocalTextures
: parent_(parent)
{
connections_.Add(theme::Settings::Get()->theme.changed.connect([this] (std::string const&) {
- ReloadIconSxtures(parent_->icon_size, parent_->image_size);
+ if (!texture_files_.empty())
+ ReloadIconSizedTextures(parent_->icon_size, parent_->image_size);
}));
auto clear_labels = sigc::hide(sigc::mem_fun(this, &LocalTextures::ClearLabels));