From 0ed7ead8df7398ebddf0680d873d7a04ee4bd9ec Mon Sep 17 00:00:00 2001
From: cryptozoidberg <crypto.zoidberg@gmail.com>
Date: Wed, 11 Jan 2023 14:57:51 +0100
Subject: [PATCH] added detecting of an AppImage and set proper path to html
 foldr

---
 contrib/tor-connect            |  2 +-
 src/gui/qt-daemon/layout       |  2 +-
 src/wallet/wallets_manager.cpp | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/contrib/tor-connect b/contrib/tor-connect
index aa509880..b589edb1 160000
--- a/contrib/tor-connect
+++ b/contrib/tor-connect
@@ -1 +1 @@
-Subproject commit aa509880f06292ac8078046f3d49ff854e400716
+Subproject commit b589edb1906dccb387cfeded6ed12286c5f0405f
diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
index b091d45a..73d36003 160000
--- a/src/gui/qt-daemon/layout
+++ b/src/gui/qt-daemon/layout
@@ -1 +1 @@
-Subproject commit b091d45ad697db2d35e94de41be3f175bad0f71d
+Subproject commit 73d36003da48622469ebe8f5bd39d2a8ed49a5d5
diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp
index 54a5cb26..161a6e13 100644
--- a/src/wallet/wallets_manager.cpp
+++ b/src/wallet/wallets_manager.cpp
@@ -331,7 +331,18 @@ bool wallets_manager::init(view::i_view* pview_handler)
   std::string path_to_html;
   if (!command_line::has_arg(m_vm, arg_html_folder))
   {
-    path_to_html = string_tools::get_current_module_folder() + "/html";
+#if defined(__unix__) || defined(__linux__)
+    const char* env_p = std::getenv("APPDIR");
+    if (env_p && std::strlen(env_p))
+    {
+      //app running inside AppImage
+      path_to_html = std::string(env_p) + "usr/bin/html";
+    }
+    else
+#endif
+    {
+      path_to_html = string_tools::get_current_module_folder() + "/html";
+    }
   }
   else
   {