From 81c476c1bb4ad78c08488d52028d7f55f06abdc2 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Wed, 9 Sep 2020 22:04:24 +0900
Subject: [PATCH] TheDesk 21.2.2 (Mayu)

---
 app/main/css.js                 | 10 +++++-----
 app/package.json                |  2 +-
 app/view/make/index.sample.html |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/main/css.js b/app/main/css.js
index 7ba1ed00..0903642c 100644
--- a/app/main/css.js
+++ b/app/main/css.js
@@ -44,7 +44,7 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-json-request', function (e, arg) {
 		try {
-			var themecss = join('./source/themes', arg)
+			var themecss = join(app.getAppPath(), '/source/themes', arg)
 			var raw = fs.readFileSync(themecss, 'utf8')
 			var json = JSON5.parse(raw)
 		} catch {
@@ -56,7 +56,7 @@ function css(mainWindow) {
 	})
 	ipc.on('theme-css-request', function (e, arg) {
 		try {
-			var themecss = join('./source/themes', arg)
+			var themecss = join(app.getAppPath(), '/source/themes', arg)
 			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
 		} catch {
 			var themecss = join(app.getPath("userData"), arg)
@@ -227,10 +227,10 @@ function css(mainWindow) {
 		return css
 	}
 	ipc.on('theme-json-list', function (e, arg) {
-		var files1 = fs.readdirSync('./source/themes')
+		var files1 = fs.readdirSync(join(app.getAppPath(), '/source/themes'))
 		var file1List = files1.filter(function (file) {
 			if (file.match(/\.thedesktheme$/)) {
-				var tfile = join('./source/themes', file)
+				var tfile = join(app.getAppPath(), '/source/themes', file)
 				return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
 			} else {
 				return null
@@ -238,7 +238,7 @@ function css(mainWindow) {
 		})
 		var themes = [];
 		for (var i = 0; i < file1List.length; i++) {
-			var themecss = join('./source/themes', file1List[i]);
+			var themecss = join(app.getAppPath(), '/source/themes', file1List[i]);
 			var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
 			let compat = true
 			if (json.version) compat = false
diff --git a/app/package.json b/app/package.json
index 21c71519..42a083c8 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thedesk",
-    "version": "21.2.1",
+    "version": "21.2.2",
     "codename": "Mayu",
     "description": "TheDesk is a Mastodon client for PC.",
     "repository": "https://github.com/cutls/TheDesk",
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index ccdd2287..0e086d1c 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -1123,12 +1123,13 @@
 				<a href="https://thedesk.top" target="_blank">HP</a><br />
 				<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
 				<br />
-				<div id="release-21-2-1_Mayu" class="release-do" style="display:none; ">
+				<div id="release-21-2-2_Mayu" class="release-do" style="display:none; ">
 					<br />
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
 					Pixiv
 					FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+					<h5>Release Note 21.2.2 (Mayu)</h5>
 					<h5>Release Note 21.2.1 (Mayu)</h5>
 					<h5>Release Note 21.2.0 (Mayu)</h5>
 					<!--上のdivのidも変えてね-->