From f192adfb7cbe2cd15912a42caa358b876c862054 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 31 Dec 2019 17:52:15 +0500
Subject: [PATCH 1/4] Fixed: Snapshots: Open discarded tabs when possible
 (#117)

---
 addon/actions/snapshots.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/actions/snapshots.js b/addon/actions/snapshots.js
index 39eb64016..c2a7895b9 100644
--- a/addon/actions/snapshots.js
+++ b/addon/actions/snapshots.js
@@ -164,7 +164,7 @@ async function openSnapshotWindow(snapshot, winId) {
   for (let i = 0; i < tabs.length; i++) {
     let tab = tabs[i]
     let ctr = containers[tab.ctr]
-    let ctrId = ctr ? ctr.newId : undefined
+    let ctrId = ctr ? ctr.newId : DEFAULT_CTX_ID
 
     parents[tab.lvl] = tab.id
 

From 025040f3ecea948467d636bb94073292dbdedc4a Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 31 Dec 2019 17:55:16 +0500
Subject: [PATCH 2/4] Fixed: Snapshots viewer: Check containers before
 rendering

---
 src/page.settings/components/snapshots.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/page.settings/components/snapshots.vue b/src/page.settings/components/snapshots.vue
index afdd00a07..0b4d156db 100644
--- a/src/page.settings/components/snapshots.vue
+++ b/src/page.settings/components/snapshots.vue
@@ -381,7 +381,7 @@ function normalizeSnapshot(snapshot) {
       // Tabs
       for (let tab of snapshot.windows[winId].items) {
         if (panel.id !== tab.panel) continue
-        if (tab.ctr !== DEFAULT_CTR.id) {
+        if (tab.ctr !== DEFAULT_CTR.id && snapshot.containersById[tab.ctr]) {
           tab.ctrIcon = snapshot.containersById[tab.ctr].icon
           tab.ctrColor = snapshot.containersById[tab.ctr].color
         }

From 0db7b20e015e544d30173cfe6c52b42bf2a15b36 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 31 Dec 2019 17:57:00 +0500
Subject: [PATCH 3/4] Fixed: Context menu: Check available containers for
 reopening tabs (#117)

---
 addon/defaults.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/defaults.js b/addon/defaults.js
index 1b6a87e7c..c3920a593 100644
--- a/addon/defaults.js
+++ b/addon/defaults.js
@@ -497,7 +497,7 @@ export const MENU_OPTIONS = {
     }
 
     for (let c of Object.values(state.containers)) {
-      if (firstNode.cookieStoreId === c.cookieStoreId) continue
+      if (firstNode.cookieStoreId === c.id) continue
       opts.push({
         label: translate('menu.tab.reopen_in_') + `||${c.color}>>${c.name}`,
         nativeLabel: translate('menu.tab.reopen_in_') + c.name,

From e71db635fe82e26b1ae3df72c943cd1db1e32b08 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 31 Dec 2019 18:07:54 +0500
Subject: [PATCH 4/4] Bump version v4.0.4

---
 addon/manifest.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/manifest.json b/addon/manifest.json
index 7ec45c71f..1579d23f2 100644
--- a/addon/manifest.json
+++ b/addon/manifest.json
@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "default_locale": "en",
   "description": "__MSG_ExtDesc__",
   "homepage_url": "https://github.com/mbnuqw/sidebery",
diff --git a/package.json b/package.json
index 948c684e6..38e667992 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sidebery",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Manage your tabs and bookmarks in sidebar",
   "main": "index.js",
   "scripts": {