From: Alan Knowles <alan@roojs.com>
Date: Wed, 30 Jan 2019 08:24:24 +0000 (+0800)
Subject: MergeBranch.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=refs%2Fheads%2Fwip_alan_T5639_gitlive_general_tidy_ups

MergeBranch.bjs
MergeBranch.vala
---

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index f45c0b04..3b4e284d 100644
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -136,7 +136,7 @@
         },
         {
          "listeners" : {
-          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\t  \n\t_this.view.loadTicket(ticket.id);\n\t _this.name.updateText();\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
+          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\t  \n\t_this.view.loadTicket(this.selectedTicketId());\n\t _this.name.updateText();\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
          },
          "* ctor" : "new Gtk.ComboBox.with_entry()",
          "id" : "ticketsel",
diff --git a/MergeBranch.vala b/MergeBranch.vala
index 9ec2ac3c..a0c62292 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -675,7 +675,7 @@ public class MergeBranch : Object
             		return;
             	}
             	  
-            	_this.view.loadTicket(ticket.id);
+            	_this.view.loadTicket(this.selectedTicketId());
             	 _this.name.updateText();
             	//GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
             });