Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector

2025-06-12 05:07:46 +02:00 · 2024-05-30 14:25:51 +03:00
parent 633489884d f34c263964
commit 75fbdc2df5
8 changed files with 44 additions and 52 deletions
--- a/launcher/net/NetJob.h
+++ b/launcher/net/NetJob.h
@ -66,6 +66,7 @@ class NetJob : public ConcurrentTask {
   public slots:
    // Qt can't handle auto at the start for some reason?
    bool abort() override;
+    void emitFailed(QString reason) override;

   protected slots:
    void executeNextSubTask() override;