fixed fallback.exe

PoE-TradeMacro · Nov 14, 2017 · 6db798c · 6db798c
1 parent c22f441
commit 6db798c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Fallback.exe b/Fallback.exe
diff --git a/_compileRelease.ahk b/_compileRelease.ahk
@@ -1,8 +1,8 @@
-If (!FileExist(A_ScriptDir "\_TradeMacroMain.ahk")) {
-	RunWait, Run_TradeMacro.ahk
-	While (!FileExist(A_ScriptDir "\_TradeMacroMain.ahk")) {
-		Sleep, 500
-	}
+#SingleInstance, force
+
+RunWait, Run_TradeMacro.ahk -mergeonly
+While (!FileExist(A_ScriptDir "\_TradeMacroMain.ahk")) {
+	Sleep, 500
 }
 
 SplitPath, A_AhkPath,, AhkDir

diff --git a/resources/ahk/Merge_TradeMacro.ahk b/resources/ahk/Merge_TradeMacro.ahk
@@ -30,6 +30,10 @@ If (InStr(arguments, "-nosplash", 0)) {
 	StartSplashScreen()
 }
 
+If (InStr(arguments, "-mergeonly", 0)) {
+	onlyMergeFiles := 1
+}
+
 /*
 	Set ProjectName to create user settings folder in A_MyDocuments
 */
@@ -88,7 +92,9 @@ FileAppend, %trade%		, %scriptDir%\_TradeMacroMain.ahk
 ; set script hidden
 FileSetAttrib, +H, %scriptDir%\_TradeMacroMain.ahk
 ; pass some parameters to TradeMacroInit
-Run "%A_AhkPath%" "%scriptDir%\_TradeMacroMain.ahk" "%projectName%" "%userDirectory%" "%isDevelopmentVersion%" "%overwrittenFiles%" "isMergedScript" "%skipSplash%"
+If (not onlyMergeFiles) {
+	Run "%A_AhkPath%" "%scriptDir%\_TradeMacroMain.ahk" "%projectName%" "%userDirectory%" "%isDevelopmentVersion%" "%overwrittenFiles%" "isMergedScript" "%skipSplash%"
+}
 
 ExitApp
 

diff --git a/resources/ahk/TradeMacroInit.ahk b/resources/ahk/TradeMacroInit.ahk
@@ -87,10 +87,10 @@ argumentOverwrittenFiles = %4%
 If (!StrLen(argumentProjectName) > 0) {
 	argumentProjectName		:= "PoE-TradeMacro"
 	FilesToCopyToUserFolder	:= A_ScriptDir . "\resources\default_UserFiles"
-	argumentOverwrittenFiles	:= PoEScripts_HandleUserSettings(projectName, A_MyDocuments, projectName, FilesToCopyToUserFolder, A_ScriptDir)
+	argumentOverwrittenFiles	:= PoEScripts_HandleUserSettings(argumentProjectName, A_MyDocuments, argumentProjectName, FilesToCopyToUserFolder, A_ScriptDir)
 	argumentIsDevVersion	:= PoEScripts_isDevelopmentVersion(A_ScriptDir)
-	argumentUserDirectory	:= A_MyDocuments . "\" . projectName . isDevelopmentVersion
-
+	argumentUserDirectory	:= A_MyDocuments . "\" . argumentProjectName . argumentIsDevVersion
+	
 	If (!PoEScripts_CreateTempFolder(A_ScriptDir, "PoE-TradeMacro")) {
 		ExitApp
 	}