fix for bug when turning off pc

laaksomavrick · May 6, 2018 · 1d2b1db · 1d2b1db
1 parent f29097d
commit 1d2b1db
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 10 deletions.
diff --git a/Spotify Helper.xcodeproj/project.pbxproj b/Spotify Helper.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 				DEVELOPMENT_TEAM = ERGBBR34XM;
 				INFOPLIST_FILE = "$(SRCROOT)/Spotify Helper/Config/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.lucid.Spotify-Helper";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mavricklaakso.spotifymenubar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;
@@ -386,7 +386,7 @@
 				DEVELOPMENT_TEAM = ERGBBR34XM;
 				INFOPLIST_FILE = "$(SRCROOT)/Spotify Helper/Config/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.lucid.Spotify-Helper";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mavricklaakso.spotifymenubar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;

diff --git a/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcschemes/Spotify Helper.xcscheme b/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcschemes/Spotify Helper.xcscheme
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6A533DAB1F996CA70014B2CA"
+               BuildableName = "Spotify Helper.app"
+               BlueprintName = "Spotify Helper"
+               ReferencedContainer = "container:Spotify Helper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6A533DAB1F996CA70014B2CA"
+            BuildableName = "Spotify Helper.app"
+            BlueprintName = "Spotify Helper"
+            ReferencedContainer = "container:Spotify Helper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6A533DAB1F996CA70014B2CA"
+            BuildableName = "Spotify Helper.app"
+            BlueprintName = "Spotify Helper"
+            ReferencedContainer = "container:Spotify Helper.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6A533DAB1F996CA70014B2CA"
+            BuildableName = "Spotify Helper.app"
+            BlueprintName = "Spotify Helper"
+            ReferencedContainer = "container:Spotify Helper.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      customArchiveName = "Spotify Menu Bar"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcschemes/xcschememanagement.plist b/Spotify Helper.xcodeproj/xcuserdata/mlaakso.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -10,5 +10,13 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>6A533DAB1F996CA70014B2CA</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/Spotify Helper/AppDelegate.swift b/Spotify Helper/AppDelegate.swift
@@ -19,7 +19,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {
-        //...
+        exit(0)
     }
 
 }

diff --git a/Spotify Helper/Config/Info.plist b/Spotify Helper/Config/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSUIElement</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -24,16 +22,18 @@
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017 Lucid Development. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
 </dict>
 </plist>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { @@
         }
         func applicationWillTerminate(_ aNotification: Notification) {
-            //...
+            exit(0)
         }
     }
@@ Expand Down @@