Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

launcher/minecraft/launch/ClaimAccount.h

@@ -22,7 +22,7 @@ class ClaimAccount : public LaunchStep {
     Q_OBJECT
    public:
     explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
-    virtual ~ClaimAccount(){};
+    virtual ~ClaimAccount() {};
 
     void executeTask() override;
     void finalize() override;

launcher/minecraft/launch/CreateGameFolders.h

@@ -24,7 +24,7 @@ class CreateGameFolders : public LaunchStep {
     Q_OBJECT
    public:
     explicit CreateGameFolders(LaunchTask* parent);
-    virtual ~CreateGameFolders(){};
+    virtual ~CreateGameFolders() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/minecraft/launch/ExtractNatives.h

@@ -21,8 +21,8 @@
 class ExtractNatives : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent){};
-    virtual ~ExtractNatives(){};
+    explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent) {};
+    virtual ~ExtractNatives() {};
 
     void executeTask() override;
     bool canAbort() const override { return false; }

launcher/minecraft/launch/LauncherPartLaunch.cpp

@@ -178,6 +178,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
                 APPLICATION->showMainWindow();
 
             m_parent->setPid(-1);
+            m_parent->instance()->setMinecraftRunning(false);
             // if the exit code wasn't 0, report this as a crash
             auto exitCode = m_process.exitCode();
             if (exitCode != 0) {
@@ -193,7 +194,6 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
         case LoggedProcess::Running:
             emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::Launcher);
             m_parent->setPid(m_process.processId());
-            m_parent->instance()->setLastLaunch();
             // send the launch script to the launcher part
             m_process.write(m_launchScript.toUtf8());
 
@@ -213,6 +213,7 @@ void LauncherPartLaunch::setWorkingDirectory(const QString& wd)
 void LauncherPartLaunch::proceed()
 {
     if (mayProceed) {
+        m_parent->instance()->setMinecraftRunning(true);
         QString launchString("launch\n");
         m_process.write(launchString.toUtf8());
         mayProceed = false;

launcher/minecraft/launch/LauncherPartLaunch.h

@@ -25,7 +25,7 @@ class LauncherPartLaunch : public LaunchStep {
     Q_OBJECT
    public:
     explicit LauncherPartLaunch(LaunchTask* parent);
-    virtual ~LauncherPartLaunch(){};
+    virtual ~LauncherPartLaunch() {};
 
     virtual void executeTask();
     virtual bool abort();

launcher/minecraft/launch/ModMinecraftJar.h

@@ -21,8 +21,8 @@
 class ModMinecraftJar : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent){};
-    virtual ~ModMinecraftJar(){};
+    explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent) {};
+    virtual ~ModMinecraftJar() {};
 
     virtual void executeTask() override;
     virtual bool canAbort() const override { return false; }

launcher/minecraft/launch/PrintInstanceInfo.h

@@ -25,8 +25,8 @@ class PrintInstanceInfo : public LaunchStep {
     Q_OBJECT
    public:
     explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
-        : LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin){};
-    virtual ~PrintInstanceInfo(){};
+        : LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin) {};
+    virtual ~PrintInstanceInfo() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/minecraft/launch/ReconstructAssets.h

@@ -21,8 +21,8 @@
 class ReconstructAssets : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent){};
-    virtual ~ReconstructAssets(){};
+    explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent) {};
+    virtual ~ReconstructAssets() {};
 
     void executeTask() override;
     bool canAbort() const override { return false; }

launcher/minecraft/launch/ScanModFolders.h

@@ -21,8 +21,8 @@
 class ScanModFolders : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent){};
-    virtual ~ScanModFolders(){};
+    explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent) {};
+    virtual ~ScanModFolders() {};
 
     virtual void executeTask() override;
     virtual bool canAbort() const override { return false; }

launcher/minecraft/launch/VerifyJavaInstall.h

@@ -42,7 +42,7 @@ class VerifyJavaInstall : public LaunchStep {
     Q_OBJECT
 
    public:
-    explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent){};
+    explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent) {};
     ~VerifyJavaInstall() override = default;
 
     void executeTask() override;