From 66a50c8019a8196edd016f6f8197f67abfbdac19 Mon Sep 17 00:00:00 2001
From: binary-husky <qingxu.fu@outlook.com>
Date: Sat, 1 Jun 2024 16:21:04 +0000
Subject: [PATCH] live2d shutdown bug fix

---
 themes/common.js                  | 71 +++++++++++++++++--------------
 themes/waifu_plugin/waifu-tips.js |  8 +++-
 2 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/themes/common.js b/themes/common.js
index 68f9f2b3..ab39eac7 100644
--- a/themes/common.js
+++ b/themes/common.js
@@ -831,39 +831,44 @@ function limit_scroll_position() {
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 function loadLive2D() {
-    try {
-        $("<link>").attr({ href: "file=themes/waifu_plugin/waifu.css", rel: "stylesheet", type: "text/css" }).appendTo('head');
-        $('body').append('<div class="waifu"><div class="waifu-tips"></div><canvas id="live2d" class="live2d"></canvas><div class="waifu-tool"><span class="fui-home"></span> <span class="fui-chat"></span> <span class="fui-eye"></span> <span class="fui-user"></span> <span class="fui-photo"></span> <span class="fui-info-circle"></span> <span class="fui-cross"></span></div></div>');
-        $.ajax({
-            url: "file=themes/waifu_plugin/waifu-tips.js", dataType: "script", cache: true, success: function () {
-                $.ajax({
-                    url: "file=themes/waifu_plugin/live2d.js", dataType: "script", cache: true, success: function () {
-                        /* 可直接修改部分参数 */
-                        live2d_settings['hitokotoAPI'] = "hitokoto.cn";  // 一言 API
-                        live2d_settings['modelId'] = 3;                  // 默认模型 ID
-                        live2d_settings['modelTexturesId'] = 44;          // 默认材质 ID
-                        live2d_settings['modelStorage'] = false;         // 不储存模型 ID
-                        live2d_settings['waifuSize'] = '210x187';
-                        live2d_settings['waifuTipsSize'] = '187x52';
-                        live2d_settings['canSwitchModel'] = true;
-                        live2d_settings['canSwitchTextures'] = true;
-                        live2d_settings['canSwitchHitokoto'] = false;
-                        live2d_settings['canTakeScreenshot'] = false;
-                        live2d_settings['canTurnToHomePage'] = false;
-                        live2d_settings['canTurnToAboutPage'] = false;
-                        live2d_settings['showHitokoto'] = false;          // 显示一言
-                        live2d_settings['showF12Status'] = false;         // 显示加载状态
-                        live2d_settings['showF12Message'] = false;        // 显示看板娘消息
-                        live2d_settings['showF12OpenMsg'] = false;        // 显示控制台打开提示
-                        live2d_settings['showCopyMessage'] = false;       // 显示 复制内容 提示
-                        live2d_settings['showWelcomeMessage'] = true;     // 显示进入面页欢迎词
-                        /* 在 initModel 前添加 */
-                        initModel("file=themes/waifu_plugin/waifu-tips.json");
-                    }
-                });
-            }
-        });
-    } catch (err) { console.log("[Error] JQuery is not defined.") }
+    if (document.querySelector(".waifu") )
+    {
+        $('.waifu').show();
+    } else {
+        try {
+            $("<link>").attr({ href: "file=themes/waifu_plugin/waifu.css", rel: "stylesheet", type: "text/css" }).appendTo('head');
+            $('body').append('<div class="waifu"><div class="waifu-tips"></div><canvas id="live2d" class="live2d"></canvas><div class="waifu-tool"><span class="fui-home"></span> <span class="fui-chat"></span> <span class="fui-eye"></span> <span class="fui-user"></span> <span class="fui-photo"></span> <span class="fui-info-circle"></span> <span class="fui-cross"></span></div></div>');
+            $.ajax({
+                url: "file=themes/waifu_plugin/waifu-tips.js", dataType: "script", cache: true, success: function () {
+                    $.ajax({
+                        url: "file=themes/waifu_plugin/live2d.js", dataType: "script", cache: true, success: function () {
+                            /* 可直接修改部分参数 */
+                            live2d_settings['hitokotoAPI'] = "hitokoto.cn";  // 一言 API
+                            live2d_settings['modelId'] = 3;                  // 默认模型 ID
+                            live2d_settings['modelTexturesId'] = 44;          // 默认材质 ID
+                            live2d_settings['modelStorage'] = false;         // 不储存模型 ID
+                            live2d_settings['waifuSize'] = '210x187';
+                            live2d_settings['waifuTipsSize'] = '187x52';
+                            live2d_settings['canSwitchModel'] = true;
+                            live2d_settings['canSwitchTextures'] = true;
+                            live2d_settings['canSwitchHitokoto'] = false;
+                            live2d_settings['canTakeScreenshot'] = false;
+                            live2d_settings['canTurnToHomePage'] = false;
+                            live2d_settings['canTurnToAboutPage'] = false;
+                            live2d_settings['showHitokoto'] = false;          // 显示一言
+                            live2d_settings['showF12Status'] = false;         // 显示加载状态
+                            live2d_settings['showF12Message'] = false;        // 显示看板娘消息
+                            live2d_settings['showF12OpenMsg'] = false;        // 显示控制台打开提示
+                            live2d_settings['showCopyMessage'] = false;       // 显示 复制内容 提示
+                            live2d_settings['showWelcomeMessage'] = true;     // 显示进入面页欢迎词
+                            /* 在 initModel 前添加 */
+                            initModel("file=themes/waifu_plugin/waifu-tips.json");
+                        }
+                    });
+                }
+            });
+        } catch (err) { console.log("[Error] JQuery is not defined.") }
+    }
 }
 
 
diff --git a/themes/waifu_plugin/waifu-tips.js b/themes/waifu_plugin/waifu-tips.js
index 6e25682c..56431722 100644
--- a/themes/waifu_plugin/waifu-tips.js
+++ b/themes/waifu_plugin/waifu-tips.js
@@ -142,7 +142,13 @@ function initModel(waifuPath, type) {
     if (live2d_settings.waifuEdgeSide[0] == 'left') $(".waifu").css("left",live2d_settings.waifuEdgeSide[1]+'px');
     else if (live2d_settings.waifuEdgeSide[0] == 'right') $(".waifu").css("right",live2d_settings.waifuEdgeSide[1]+'px');
 
-    window.waifuResize = function() { $(window).width() <= Number(live2d_settings.waifuMinWidth.replace('px','')) ? $(".waifu").hide() : $(".waifu").show(); };
+    window.waifuResize = function() {
+        console.log('resize');
+        if ($('.waifu')[0].style.display === "none" ){
+        } else{
+            $(window).width() <= Number(live2d_settings.waifuMinWidth.replace('px','')) ? $(".waifu").hide() : $(".waifu").show();
+        }
+    };
     if (live2d_settings.waifuMinWidth != 'disable') { waifuResize(); $(window).resize(function() {waifuResize()}); }
 
     try {