View | Details | Raw Unified | Return to bug 51496
Collapse All | Expand All

(-)trunk/res/tomcat.nsi (+19 lines)
Lines 51-56 Link Here
51
Var TomcatMenuEntriesEnable
51
Var TomcatMenuEntriesEnable
52
Var TomcatShortcutAllUsers
52
Var TomcatShortcutAllUsers
53
Var TomcatServiceName
53
Var TomcatServiceName
54
Var TomcatServiceNameAllreadyInstalled
54
Var TomcatServiceDefaultName
55
Var TomcatServiceDefaultName
55
Var TomcatServiceFileName
56
Var TomcatServiceFileName
56
Var TomcatServiceManagerFileName
57
Var TomcatServiceManagerFileName
Lines 573-578 Link Here
573
    Goto exit
574
    Goto exit
574
  ${EndIf}
575
  ${EndIf}
575
576
577
  ReadRegStr $TomcatServiceNameAllreadyInstalled HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" \
578
    "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
579
  ${If} $TomcatServiceNameAllreadyInstalled != ""
580
    MessageBox MB_ICONEXCLAMATION|MB_OK 'A service with the given Service Name is allready installed on the machine. \
581
      Please choose another Service Name'
582
    Abort "Config not right"
583
    Goto exit
584
  ${EndIf}
585
  
586
  ReadRegStr $TomcatServiceNameAllreadyInstalled HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" \
587
    "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
588
  ${If} $TomcatServiceNameAllreadyInstalled != ""
589
    MessageBox MB_ICONEXCLAMATION|MB_OK 'A service with the given Service Name is allready installed on the machine. \
590
      Please choose another Service Name'
591
    Abort "Config not right"
592
    Goto exit
593
  ${EndIf}
594
  
576
  Push $TomcatServiceName
595
  Push $TomcatServiceName
577
  Call validateServiceName
596
  Call validateServiceName
578
  Pop $0
597
  Pop $0

Return to bug 51496