From af27f1a6e740aee54ee37b76955783bb559f9c89 Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Sat, 21 May 2022 19:18:34 +0200 Subject: [PATCH] Splash+revert cache vars that didnt do anything --- AM2RLauncher/AM2RLauncherCore/Core.cs | 4 +++- .../AM2RLauncherCore/CrossPlatformOperations.cs | 13 +------------ AM2RLauncher/AM2RLauncherCore/Splash.cs | 5 ++++- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/AM2RLauncher/AM2RLauncherCore/Core.cs b/AM2RLauncher/AM2RLauncherCore/Core.cs index bff7a5c..bbfbd2b 100644 --- a/AM2RLauncher/AM2RLauncherCore/Core.cs +++ b/AM2RLauncher/AM2RLauncherCore/Core.cs @@ -50,11 +50,13 @@ public static class Core public static readonly bool IsThisRunningFromWine = CheckIfRunFromWINE(); /// - /// Checks if this is ran from WINE + /// Checks if the Launcher is ran from WINE. /// /// if run from WINE, if not. private static bool CheckIfRunFromWINE() { + // We check for wine by seeing if a reg entry exists. + // Not the best way, and could be removed from the future, but good enough for our purposes. if (OS.IsWindows && (Microsoft.Win32.Registry.CurrentUser.OpenSubKey("Software\\Wine") != null)) return true; diff --git a/AM2RLauncher/AM2RLauncherCore/CrossPlatformOperations.cs b/AM2RLauncher/AM2RLauncherCore/CrossPlatformOperations.cs index 6f8b432..21e9eb1 100644 --- a/AM2RLauncher/AM2RLauncherCore/CrossPlatformOperations.cs +++ b/AM2RLauncher/AM2RLauncherCore/CrossPlatformOperations.cs @@ -48,21 +48,10 @@ public static class CrossPlatformOperations } } - private static string _currentPath; - /// /// Current Path where the Launcher Data is located. /// - public static string CurrentPath - { - get - { - if (_currentPath is null) - _currentPath = GenerateCurrentPath(); - - return _currentPath; - } - } + public static readonly string CurrentPath = GenerateCurrentPath(); /// /// Generates the mirror list, depending on the current Platform. diff --git a/AM2RLauncher/AM2RLauncherCore/Splash.cs b/AM2RLauncher/AM2RLauncherCore/Splash.cs index e9c59eb..85380f6 100644 --- a/AM2RLauncher/AM2RLauncherCore/Splash.cs +++ b/AM2RLauncher/AM2RLauncherCore/Splash.cs @@ -55,7 +55,9 @@ public static class Splash { ":(", "All your machine are belong to MS", - "All your data are belong to us" + "All your data are belong to us", + "Go to Settings to activate AM2R.", + "(Not Responding)" }; /// @@ -73,6 +75,7 @@ public static class Splash "The quieter you are, the more Metroids you can hear.", "What you are referring to as AM2R, is in fact, GNU/AM2R.", "GNOME be gone!", + "Kurse you KDE!", "Go compile your own girlfriend. This one doesn't count, she's out of your league.", "Year 3115, NVIDIA still doesn't support Wayland.", "Was a mouse really that expensive, i3 users!?",