From 7e99696aed772fe084b5f49e20af4292b573a567 Mon Sep 17 00:00:00 2001
From: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
Date: Wed, 15 Jan 2014 14:00:04 -0800
Subject: [PATCH] buffer.js: Fix this.container.selectedPanel is undefined
 error

This occurs with Gecko >= 25
---
 modules/buffer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/buffer.js b/modules/buffer.js
index d317546..b5251a6 100644
--- a/modules/buffer.js
+++ b/modules/buffer.js
@@ -588,10 +588,14 @@ buffer_container.prototype = {
         // exists.
         var element = b.element;
         b.destroy();
+
+        // Switch to new buffer before destroying this buffer so that
+        // there always remains a selected buffer
+        this._switch_to(new_buffer);
+
         this.container.removeChild(element);
         this.buffer_list.splice(this.buffer_list.indexOf(b), 1);
         this.buffer_history.splice(this.buffer_history.indexOf(b), 1);
-        this._switch_to(new_buffer);
         if (changed) {
             select_buffer_hook.run(new_buffer);
             this.buffer_history.splice(this.buffer_history.indexOf(new_buffer), 1);
-- 
2.11.4.GIT