Skip to content

Commit 5317916

Browse files
committed
Remove Updater menu item for Store S mode
1 parent 3d7862d commit 5317916

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Ahk2Exe.ahk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ global UseAhkPath := "", AhkWorkingDir := A_WorkingDir, StopCDExe, StopCDIco
4242
, ExeFiles := [], BinFiles := [], BinNames, FileNameG, LastIdG := 1
4343
, Store := A_ScriptDir "\" ~= "i)^.:\\Program Files\\WindowsApps\\"
4444

45-
ExeDfltMes := "(Default is script file, or any relevant compiler directive)"
4645

4746
; Set default codepage from any installed AHK
4847
ScriptFileCP := A_FileEncoding
@@ -65,6 +64,7 @@ if (BinFiles.1 = SBDMes && !StopCDBin)
6564
BinFileId := 1, LastIdG := FindBinFile(LastBinFile) - 1
6665
else BinFileId := FindBinFile(LastBinFile)
6766

67+
ExeDfltMes := "(Default is script file, or any relevant compiler directive)"
6868
AllowMes0 := "A&llow Gui Shrinkage`tAlt+L"
6969
AllowMes1 := "Disa&llow Gui Shrinkage`tAlt+L"
7070
SaveMes := "S&ave Script Settings As…`tCtrl+S"
@@ -80,7 +80,9 @@ Menu, FileMenu, Add, &Convert`tAlt+C, Convert
8080
Menu, FileMenu, Add
8181
Menu, FileMenu, Add, E&xit`tAlt+F4, GuiClose
8282
Menu, HelpMenu, Add, &Help`tF1, % Help0
83-
Menu, HelpMenu, Add, Check for Updates...`tAlt+K, Update
83+
RunWait "%ComSpec%" /c echo 1,,UseErrorLevel Hide
84+
if !(ErrorLevel && Store && ComSpec) ;No update if Store S mode & ComSpec exists
85+
Menu, HelpMenu, Add, Check for Updates...`tAlt+K, Update
8486
Menu, HelpMenu, Add
8587
Menu, HelpMenu, Add, &About, About
8688
Menu, MenuBar, Add, &File, :FileMenu
@@ -762,7 +764,7 @@ Util_Status(s) ;v Keep early status for GUI
762764
Util_Error(txt, exitcode, extra := "", extra1 := "", HourGlass := 1)
763765
{ global CLIMode, ExeFileTmp, SilentMode, AhkFile
764766
if extra
765-
txt .= "`n`nSpecifically:`n" extra
767+
txt .= "`n`nNamely:`n" extra
766768
if extra1
767769
txt .= "`n`n" extra1
768770
Util_HideHourglass()

ScriptParser.ahk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ Util_TempFile(d := "", f := "", xep := "")
267267
return tempName
268268
}
269269

270+
270271
RunCMD(CmdLine, WorkingDir:="", Codepage:="CP0", Fn:="RunCMD_Output", Slow:=1)
271272
{ Local ; RunCMD v0.97 by SKAN on D34E/D67E
272273
; @ autohotkey.com/boards/viewtopic.php?t=74647

0 commit comments

Comments
 (0)