From d7bc7cb3bfa54ad3afd01c9b37ced69b2382a377 Mon Sep 17 00:00:00 2001
From: Nelo Wallus <nelo@wallus.de>
Date: Fri, 8 Jan 2016 19:50:55 +0100
Subject: [PATCH] Fix 'ga' not properly closing parent fold

---
 plugins/contrib/treestyletabs.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/contrib/treestyletabs.js b/plugins/contrib/treestyletabs.js
index 2e8fd870..166a370b 100644
--- a/plugins/contrib/treestyletabs.js
+++ b/plugins/contrib/treestyletabs.js
@@ -36,8 +36,15 @@ function fold_collapse_expand_target(tab, collapse, children = false) {
 }
 
 function fold_collapse_expand(collapse, children = false) {
+    let tab = gBrowser.tabContainer.selectedItem;
+
+    if (!TreeStyleTabService.hasChildTabs(tab)) {
+        let tab = TreeStyleTabService.getParentTab(tab);
+        collapse = TreeStyleTabService.isSubtreeCollapsed(tab);
+    }
+
     fold_collapse_expand_target(
-        gBrowser.tabContainer.selectedItem,
+        tab,
         collapse,
         children
         );