From 9ce7fe356f80ef0ab4ba95ebc77527ddc5965f57 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 12:58:43 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 2 +- RepoStatusPopover.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index 68eb5221..ad4c1e39 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -148,7 +148,7 @@ }, { "listeners" : { - "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repo.activeTicket) {\n\t MergeBranch.singleton().show(this.repo.activeTicket, null); \n }\n return false;\n}" + "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repo.activeTicket != null) {\n\t MergeBranch.singleton().show(this.repo.activeTicket, null); \n }\n return false;\n}" }, "label" : "Merge branch/ ticket", "xtype" : "Button", diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index fafcc507..33cd4028 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -588,7 +588,7 @@ public class RepoStatusPopover : Object _this.el.hide(); Clones.singleton().el.response(-1); - if (_this.repo.activeTicket) { + if (_this.repo.activeTicket != null) { MergeBranch.singleton().show(this.repo.activeTicket, null); } return false; -- 2.39.2