From a5e13d55447dfa94e510ea934039aa81a567e901 Mon Sep 17 00:00:00 2001
From: TheGoddessInari <thegoddessinari@gmail.com>
Date: Tue, 4 Feb 2020 15:42:51 -0800
Subject: [PATCH] Guard service removal code properly.

Fixes #166.
---
 app/view/main/MainController.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js
index b8a0d34c..eb6869f2 100644
--- a/app/view/main/MainController.js
+++ b/app/view/main/MainController.js
@@ -63,9 +63,11 @@ Ext.define('Hamsket.view.main.MainController', {
 			if ( t.id !== 'hamsketTab' && t.id !== 'tbfill' && t.record.get('enabled') ) {
 				const rec = store.getById(t.record.get('id'));
 				if ( align === 'right' ) i--;
-				rec.set('align', align);
-				rec.set('position', i);
-				rec.save();
+				if (rec) {
+					rec.set('align', align);
+					rec.set('position', i);
+					rec.save();
+				}
 			}
 			else if ( t.id === 'tbfill' ) {
 				align = 'right';
@@ -147,20 +149,19 @@ Ext.define('Hamsket.view.main.MainController', {
 			// Get Tab
 			// Clear all trash data
 			const tab = Ext.getCmp('tab_'+serviceId);
-			const webview = tab.getWebView();
-			clearData(webview, tab, resolve);
+			clearData(tab, resolve);
 		}
 
 		const config = ipc.sendSync('getConfig');
 		if ( config.default_service === rec.get('id') ) ipc.send('setConfig', Ext.apply(config, { default_service: 'hamsketTab' }));
 
-		function clearData(webview, tab, resolve) {
-			webview.getWebContents().clearHistory();
-			webview.getWebContents().session.flushStorageData();
-			webview.getWebContents().session.clearCache()
-			.then(webview.getWebContents().session.clearStorageData)
-			.then(webview.getWebContents().session.cookies.flushStore)
-			.then(function() {
+		function clearData(tab, resolve) {
+			tab.getWebContents().clearHistory();
+			tab.getWebContents().session.flushStorageData();
+			tab.getWebContents().session.clearCache()
+			.then(tab.getWebContents().session.clearStorageData)
+			.then(tab.getWebContents().session.cookies.flushStore)
+			.finally(function() {
 				// Remove record from localStorage
 				Ext.getStore('Services').remove(rec);
 				// Close tab