diff options
author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
---|---|---|
committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/shared/Utilities/ServiceWin32.cpp | |
parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/shared/Utilities/ServiceWin32.cpp')
-rwxr-xr-x | src/server/shared/Utilities/ServiceWin32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f768a3ab68c..cd623c62132 100755 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -80,7 +80,7 @@ bool WinServiceInstall() if (service) { advapi32 = GetModuleHandle("ADVAPI32.DLL"); - if(!advapi32) + if (!advapi32) { CloseServiceHandle(service); CloseServiceHandle(serviceControlManager); @@ -232,7 +232,7 @@ void WINAPI ServiceMain(DWORD argc, char *argv[]) m_ServiceStatus = 1; argc = 1; - main(argc , argv); + main(argc, argv); // service was stopped serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; |