Skip to content

Commit fffe048

Browse files
committed
- AppMan fix for executing file with a space in path and containing args, closes #1103
- Minor installer text fix and Korean locale option added
1 parent db235bf commit fffe048

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

External/Tools/AppMan/MainForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ private void RunExecutableProcess(String file)
956956
Boolean wait = Process.GetProcessesByName(DISTRO_NAME).Length == 0;
957957
if (File.Exists(fd))
958958
{
959-
Process.Start(Path.GetFullPath(fd), file + " -silent -reuse");
959+
Process.Start(Path.GetFullPath(fd), "\"" + file + "\" -silent -reuse");
960960
// If FD was not running, give it a little time to start...
961961
if (wait) Thread.Sleep(500);
962962
return;
0 Bytes
Binary file not shown.

FlashDevelop/Installer/Installer.nsi

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,28 @@ Section "Basque" BasqueLocale
389389

390390
SectionEnd
391391

392+
393+
Section "Korean" KoreanLocale
394+
395+
SetOverwrite on
396+
IfFileExists "$INSTDIR\.local" Local 0
397+
IfFileExists "$LOCALAPPDATA\${DIST_NAME}\*.*" User Done
398+
Local:
399+
ClearErrors
400+
FileOpen $1 "$INSTDIR\.locale" w
401+
IfErrors Done
402+
FileWrite $1 "ko_KR"
403+
FileClose $1
404+
User:
405+
ClearErrors
406+
FileOpen $1 "$LOCALAPPDATA\${DIST_NAME}\.locale" w
407+
IfErrors Done
408+
FileWrite $1 "ko_KR"
409+
FileClose $1
410+
Done:
411+
412+
SectionEnd
413+
392414
SectionGroupEnd
393415

394416
SectionGroup "Advanced"
@@ -456,7 +478,7 @@ Section "Registry Modifications" RegistryMods
456478

457479
; Write uninstall section keys
458480
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "InstallLocation" "$INSTDIR"
459-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "Publisher" "${DIST_COMP}g"
481+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "Publisher" "${DIST_COMP}"
460482
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "DisplayVersion" "${VERSION}"
461483
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "DisplayName" "${DIST_NAME}"
462484
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DIST_NAME}" "Comments" "Thank you for using ${DIST_NAME}."
@@ -509,6 +531,7 @@ SectionGroupEnd
509531
!insertmacro MUI_DESCRIPTION_TEXT ${JapaneseLocale} "Changes ${DIST_NAME}'s display language to Japanese on next restart."
510532
!insertmacro MUI_DESCRIPTION_TEXT ${GermanLocale} "Changes ${DIST_NAME}'s display language to German on next restart."
511533
!insertmacro MUI_DESCRIPTION_TEXT ${BasqueLocale} "Changes ${DIST_NAME}'s display language to Basque on next restart."
534+
!insertmacro MUI_DESCRIPTION_TEXT ${KoreanLocale} "Changes ${DIST_NAME}'s display language to Korean on next restart."
512535
!insertmacro MUI_DESCRIPTION_TEXT ${StartMenuGroup} "Creates a start menu group and adds default ${DIST_NAME} links to the group."
513536
!insertmacro MUI_DESCRIPTION_TEXT ${QuickShortcut} "Installs a ${DIST_NAME} shortcut to the Quick Launch bar."
514537
!insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} "Installs a ${DIST_NAME} shortcut to the desktop."
@@ -692,6 +715,7 @@ Function .onSelChange
692715
!insertmacro RadioButton ${JapaneseLocale}
693716
!insertmacro RadioButton ${GermanLocale}
694717
!insertmacro RadioButton ${BasqueLocale}
718+
!insertmacro RadioButton ${KoreanLocale}
695719
!insertmacro EndRadioButtons
696720
${EndIf}
697721

0 commit comments

Comments
 (0)