From 5d9acf57e265cc5b5da0bd5da2f56cbfe2ab596d Mon Sep 17 00:00:00 2001
From: amd64fox <amd64fox1@gmail.com>
Date: Sun, 14 Aug 2022 18:41:13 +0300
Subject: [PATCH] Update bug report and fix no_shortcut

 - added a question about the country of the account
 - fix no_shortcut
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 14 +++++++++++++-
 Install.ps1                           | 14 ++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ac50333..aa5530a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -15,7 +15,18 @@ body:
           required: true  
 - type: markdown
   attributes:
-    value: "###"          
+    value: "###"    
+- type: input
+  id: lang_spoti
+  attributes:
+    label: Сountry of your account
+    description: You can view your country on your account page, in paragraph <a href="https://www.spotify.com/account/">Country or region</a>.
+    placeholder: "e.g. Ukraine"
+  validations:
+    required: true 
+- type: markdown
+  attributes:
+    value: "###"     
 - type: dropdown
   id: plan
   attributes:
@@ -80,3 +91,4 @@ body:
     description: Place any screenshots of the issue here if needed
   validations:
     required: false    
+    
\ No newline at end of file
diff --git a/Install.ps1 b/Install.ps1
index 3b05e94..a792fec 100644
--- a/Install.ps1
+++ b/Install.ps1
@@ -1068,12 +1068,14 @@ if (-not $spotifyInstalled -or $upgrade_client) {
     while (-not (get-process | Where-Object { $_.ProcessName -eq 'SpotifySetup' })) {}
     wait-process -name SpotifySetup
     Stop-Process -Name Spotify
-    if ($no_shortcut) {
-        $ErrorActionPreference = 'SilentlyContinue'
-        $desktop_folder = DesktopFolder
-        Start-Sleep -Milliseconds 1000
-        remove-item "$desktop_folder\Spotify.lnk" -Recurse -Force
-    }
+}
+
+# Delete Spotify shortcut if it is on desktop
+if ($no_shortcut) {
+    $ErrorActionPreference = 'SilentlyContinue'
+    $desktop_folder = DesktopFolder
+    Start-Sleep -Milliseconds 1000
+    remove-item "$desktop_folder\Spotify.lnk" -Recurse -Force
 }
 
 # Delete the leveldb folder (Fixes bug with incorrect experimental features for some accounts)