Merge tag 'upstream/0.6.4'

Upstream version 0.6.4

1 files changed, 7 insertions, 6 deletions

diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala
index 6ca73cf..ac5a8fb 100644
--- a/src/utilities/bindingManager.vala
+++ b/src/utilities/bindingManager.vala
@@ -279,14 +279,15 @@ public class BindingManager : GLib.Object {
     /////////////////////////////////////////////////////////////////////
 
     public string get_assigned_id(Trigger trigger) {
-        foreach (var binding in bindings) {
-            var first = Trigger.remove_optional(binding.trigger.name);
-            var second = Trigger.remove_optional(trigger.name);
-            if (first == second) {
-                return binding.id;
+        var second = Trigger.remove_optional(trigger.name);
+        if (second != "") {
+            foreach (var binding in bindings) {
+                var first = Trigger.remove_optional(binding.trigger.name);
+                if (first == second) {
+                    return binding.id;
+                }
             }
         }
-
         return "";
     }