Merge branch 'shiftkey:linux' into linux

shiftkey · Dec 19, 2023 · c2162a7 · c2162a7
2 parents 1d8752b + 3199962
commit c2162a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -234,7 +234,7 @@ jobs:
           cache: yarn
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: './artifacts'
 

diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts
@@ -2472,8 +2472,14 @@ export class Dispatcher {
    * Set the title bar style for the application
    */
   public async setTitleBarStyle(titleBarStyle: TitleBarStyle) {
+    const existingState = this.appStore.getState()
+    const { titleBarStyle: existingTitleBarStyle } = existingState
+
     await this.appStore._setTitleBarStyle(titleBarStyle)
-    this.showPopup({ type: PopupType.ConfirmRestart })
+
+    if (titleBarStyle !== existingTitleBarStyle) {
+      this.showPopup({ type: PopupType.ConfirmRestart })
+    }
   }
 
   /**