[aseprite] 128/308: Update context bar controls correctly when a new brush type is selected from a brush slot

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit a3e77a657ad7c8d83bab0ba4a9cac71a65c6b03a
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Dec 17 15:21:44 2015 -0300

    Update context bar controls correctly when a new brush type is selected from a brush slot
---
 src/app/ui/context_bar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index 741e43a..5a63ca4 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -1627,8 +1627,6 @@ void ContextBar::setActiveBrushBySlot(int slot)
         setActiveBrush(brush.brush());
       }
       else {
-        setActiveBrush(ContextBar::createBrushFromPreferences());
-
         if (brush.hasFlag(BrushSlot::Flags::BrushType))
           brushPref.type(static_cast<app::gen::BrushType>(brush.brush()->type()));
 
@@ -1637,6 +1635,8 @@ void ContextBar::setActiveBrushBySlot(int slot)
 
         if (brush.hasFlag(BrushSlot::Flags::BrushAngle))
           brushPref.angle(brush.brush()->angle());
+
+        setActiveBrush(ContextBar::createBrushFromPreferences());
       }
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git