Merge branch 'dev'

mbnuqw · Dec 31, 2019 · 314e3f9 · 314e3f9
2 parents e987e50 + e71db63
commit 314e3f9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
 

diff --git 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,

diff --git 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
@@ -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": {

diff --git 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
         }