[gimp/gimp-2-8] Bug 676279 - Ctrl or Shift causes selection tools to reset...

[Michael Natterer <mitch src gnome org>]

commit 4fdb1ec90a9c72e17356d1123f3188d6ff9e9b4d
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 17 23:31:48 2012 +0200

    Bug 676279 - Ctrl or Shift causes selection tools to reset...
    
    Make sure to not override the logic that separates the tool option's
    selection mode from the one determined by modifiers, by blindly
    calling gimp_modifiers_to_channel_op(state) on a zero state.
    (cherry picked from commit 2d882dd64f3d14511489b5c629ff90e76d393be7)

 app/tools/gimpselectiontool.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c
index 64e8c6a..438d733 100644
--- a/app/tools/gimpselectiontool.c
+++ b/app/tools/gimpselectiontool.c
@@ -133,8 +133,13 @@ gimp_selection_tool_modifier_key (GimpTool        *tool,
            */
           button_op = selection_tool->saved_operation;
         }
-      else
+      else if (state & (extend_mask |
+                        modify_mask))
         {
+          /*  else get the operation from the modifier state, but only
+           *  if there is actually a modifier pressed, so we don't
+           *  override the "last modifier released" assignment above
+           */
           button_op = gimp_modifiers_to_channel_op (state);
         }