From d37572f8508bd903ae9a20b4deb08008fa46e066 Mon Sep 17 00:00:00 2001 From: Mxmilu Date: Tue, 2 Jul 2024 21:46:10 +0800 Subject: [PATCH 1/2] Fix #3819 --- Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb | 4 ++-- .../Pages/PageVersion/PageVersionSetup.xaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb index b5422ae..7501035 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb @@ -71,9 +71,9 @@ End Sub Private Sub Btn_Click(sender As Object, e As EventArgs) Handles BtnLink.Click If BtnLink.Content = "注册账号" Then - OpenWebsite(If(McVersionCurrent Is Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister"))) + OpenWebsite(Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent)) Else - Dim Website As String = If(McVersionCurrent Is Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister")) + Dim Website As String = Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent) OpenWebsite(Website.Replace("/auth/register", "/auth/forgot")) End If End Sub diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml index 72caf3d..93592a7 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml @@ -226,4 +226,4 @@ - \ No newline at end of file + From 86a51dea787aef0e6d0998075e146378616b8d8e Mon Sep 17 00:00:00 2001 From: Mxmilu Date: Wed, 3 Jul 2024 14:06:06 +0800 Subject: [PATCH 2/2] Fix #4151 --- Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb index 7501035..3476e70 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb @@ -71,9 +71,9 @@ End Sub Private Sub Btn_Click(sender As Object, e As EventArgs) Handles BtnLink.Click If BtnLink.Content = "注册账号" Then - OpenWebsite(Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent)) + OpenWebsite(If(McVersionCurrent IsNot Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister"))) Else - Dim Website As String = Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent) + Dim Website As String = If(McVersionCurrent IsNot Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister")) OpenWebsite(Website.Replace("/auth/register", "/auth/forgot")) End If End Sub