general: General fixes, injector now works

- Tested and working on MacOS - Switch 5.0.X.

- Fixed DeviceID display error.

Author: ksmit799

launcher/globals/GUIGlobals.py

@@ -16,6 +16,7 @@
 VAR_NOT_SET = "None"
 
 DEVICE_ID = "Device ID: %s"
+DEVICE_ID_HEX = "Device ID: %#x"
 INTERMEZZO = "Selected Intermezzo: %s"
 PAYLOAD = "Selected Payload: %s"
 START = "Connect and Inject"

launcher/gui/LauncherGUI.py

@@ -109,7 +109,7 @@ def popupInfo(self, message):
 		messagebox.showinfo("Info", GUIGlobals.POPUP_INFO[message])
 
 	def setDeviceID(self, id):
-		self.deviceIDVar.set(GUIGlobals.DEVICE_ID % id)
+		self.deviceIDVar.set(GUIGlobals.DEVICE_ID_HEX % id)
 
 	def openIntermezzoSelector(self):
 		# Block button input.

launcher/injector/PayloadInjector.py

@@ -4,6 +4,7 @@
  * Injector based on reswitched/fusee-launcher.
 """
 
+import os
 import threading
 import tkinter
 import platform
@@ -62,7 +63,7 @@ def runInjector(self):
 		intermezzoPath = self.parent.intermezzoPath
 		payloadPath = self.parent.payloadPath
 
-		if not intermezzoPath or not payloadPath:
+		if not os.path.isfile(intermezzoPath) or not os.path.isfile(payloadPath):
 			print("Error: You must set both an Intermezzo path and a Payload path!")
 			self.processError('VarsNotSet')
 			return
@@ -85,8 +86,10 @@ def runInjector(self):
 		# Retrieve and print the device's ID.
 		# NOTE: We have to read the first 16 anyways before we can proceed.
 		deviceID = self.readDeviceID()
-		print("Nintendo Switch with device ID: (%s) located!" % hex(deviceID))
-		self.parent.gui.setDeviceID(hex(deviceID))
+		deviceIDHex = int.from_bytes(bytes(deviceID), byteorder='little')
+
+		print("Nintendo Switch with device ID: (%#x) located!" % deviceIDHex)
+		self.parent.gui.setDeviceID(deviceIDHex)
 
 		# Use the maximum length accepted by RCM, so we can transmit as much payload as
 		# we want; we'll take over before we get to the end.
@@ -164,14 +167,12 @@ def runInjector(self):
 			print("Lost connection to the Switch... (THIS IS NOT AN ERROR! Unless you've unplugged it).")
 			print("SUCCESS! The exploit has been triggered and you can now safely unplug your Switch!")
 			self.processInfo('SuccessfulExploit')
-			return
 
 		# Any other exception is unknown.
 		except Exception as e:
 			print(e)
 			print("Error: An unknown error occured while triggering the exploit...")
 			self.processError('UnknownError')
-			return
 
 	def read(self, length):
 		"""