From 13d0ed4061764d58de6b7ad93f0d6cc61edc339f Mon Sep 17 00:00:00 2001 From: Captain ALM Date: Sat, 20 Mar 2021 15:04:18 +0000 Subject: [PATCH 1/3] Fix install-components Library appindicator3-sharp already exists within mono. --- install-components | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install-components b/install-components index dfa6a77..aef342a 100755 --- a/install-components +++ b/install-components @@ -36,7 +36,8 @@ fi sudo chown root:root /etc/melon-vpn/client.cfg # copy more files -sudo cp MelonVPNClient/bin/Release/appindicator3-sharp.dll /usr/lib/melon-vpn/ +#sudo cp MelonVPNClient/bin/Release/appindicator3-sharp.dll /usr/lib/melon-vpn/ +# ^ Already installed by mono sudo cp MelonVPNClient/bin/Release/libnotify.net.dll /usr/lib/melon-vpn/ sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe /usr/lib/melon-vpn/ sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe.config /usr/lib/melon-vpn/ From f2be7c2f2d2cbd4d32d6f7e7c2c4bebeb3dddc71 Mon Sep 17 00:00:00 2001 From: Captain ALM Date: Sat, 20 Mar 2021 15:42:28 +0000 Subject: [PATCH 2/3] Fix component installation. Add the ability to remove the appindicator3 component if needed. --- install-components | 4 ++-- remove-appindicator3-component | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 remove-appindicator3-component diff --git a/install-components b/install-components index aef342a..dca12ac 100755 --- a/install-components +++ b/install-components @@ -36,8 +36,8 @@ fi sudo chown root:root /etc/melon-vpn/client.cfg # copy more files -#sudo cp MelonVPNClient/bin/Release/appindicator3-sharp.dll /usr/lib/melon-vpn/ -# ^ Already installed by mono +sudo cp MelonVPNClient/bin/Release/appindicator3-sharp.dll /usr/lib/melon-vpn/ +echo "[warning] appindicator3-sharp.dll has been copied as a component, if appindicator was installed through software run ./remove-appindicator3-component" sudo cp MelonVPNClient/bin/Release/libnotify.net.dll /usr/lib/melon-vpn/ sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe /usr/lib/melon-vpn/ sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe.config /usr/lib/melon-vpn/ diff --git a/remove-appindicator3-component b/remove-appindicator3-component new file mode 100755 index 0000000..02fb8dc --- /dev/null +++ b/remove-appindicator3-component @@ -0,0 +1,3 @@ +#!/bin/bash +echo "[info] Removing appindicator3-sharp.dll component" +sudo rm -f /usr/lib/melon-vpn/appindicator3-sharp.dll From 9fc3f0d57f3d61f19433683908dd2fb4910180f5 Mon Sep 17 00:00:00 2001 From: Captain ALM Date: Sat, 20 Mar 2021 15:52:18 +0000 Subject: [PATCH 3/3] Fix status if client crashes before being online to server error. --- MelonVPNCore/DaemonSocketServer.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/MelonVPNCore/DaemonSocketServer.cs b/MelonVPNCore/DaemonSocketServer.cs index 4455f0c..54ef645 100644 --- a/MelonVPNCore/DaemonSocketServer.cs +++ b/MelonVPNCore/DaemonSocketServer.cs @@ -103,12 +103,7 @@ namespace MelonVPNCore Client.SendDataMessage(DataMessage.Online, true); currentVpnProcess.EnableRaisingEvents = true; } - else - { - shouldBeRunning = false; - Client.SendDataMessage(DataMessage.Offline, true); - Client.SendCustomMessage(Messages.ClientListEmptyMsg, true); - } + else { throw new InvalidOperationException("Client crashed!"); } } catch (Exception e) {