Merge pull request #24 from antonk777/master

Handle onAppLaunchTriggered correctly
CptWesley · Jun 3, 2021 · 75d2d36 · 75d2d36
2 parents 66c2615 + 19a79e7
commit 75d2d36
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/native/windows/background/background-controller.js b/native/windows/background/background-controller.js
@@ -30,8 +30,9 @@ define([
       );
 
       overwolf.extensions.onAppLaunchTriggered.addListener(e => {
-        if (e && e.source !== 'gamelaunchevent')
-          BackgroundController._restoreLaunchWindow();
+        if (e && e.source !== 'gamelaunchevent') {
+          BackgroundController._restoreAppWindow();
+        }
       });
 
       // Listen to changes in windows
@@ -102,6 +103,20 @@ define([
       }
     }
 
+    /**
+     * Open the relevant window on user request
+     * @private
+     */
+    static async _restoreAppWindow() {
+      const isGameRunning = await runningGameService.isGameRunning();
+
+      if (isGameRunning) {
+        WindowsService.restore(WindowNames.IN_GAME);
+      } else {
+        WindowsService.restore(WindowNames.DESKTOP);
+      }
+    }
+
     /**
      * app was launched with game launch
      * @private