From f10b2768b5bfea83a96d4fea4c0aed9aeb682237 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 12:59:27 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 2 +- RepoStatusPopover.vala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index aca39758..5bb23ad7 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.repos.activeTicket != null) {\n\t MergeBranch.singleton().show(this.repos.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 548a11cd..8ac1d265 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -588,8 +588,8 @@ public class RepoStatusPopover : Object _this.el.hide(); Clones.singleton().el.response(-1); - if (_this.repos.activeTicket != null) { - MergeBranch.singleton().show(this.repos.activeTicket, null); + if (_this.repo.activeTicket != null) { + MergeBranch.singleton().show(_this.repo.activeTicket, null); } return false; }); -- 2.39.2