Permalink
Browse files

Use macro ENABLE_TEAMTALKPRO to control pro-edition, i.e. not ENABLE_…

…ENCRYPTION.
  • Loading branch information...
bear101 committed Jan 7, 2019
1 parent 46ae433 commit b1b0361ea1438dcfa94809bf4bb6895f77b1eca1
Showing with 5 additions and 1 deletion.
  1. +1 −1 Library/TeamTalkLib/bin/ttsrv/AppInfo.h
  2. +4 −0 Library/TeamTalkLib/bin/ttsrv/Main.cpp
@@ -21,7 +21,7 @@
*
*/

#if defined(ENABLE_ENCRYPTION)
#if defined(ENABLE_TEAMTALKPRO)

#define TEAMTALK_SETTINGSFILE "tt5prosrv.xml"
#define TEAMTALK_LOGFILE "tt5prosrv.log"
@@ -353,7 +353,11 @@ int RunServer(
encrypted = xmlSettings.GetCertificateFile().size() && xmlSettings.GetPrivateKeyFile().size();
#endif

#if defined(ENABLE_TEAMTALKPRO)
if(!servernode.StartServer(encrypted, SERVER_WELCOME))
#else
if(!servernode.StartServer(false, SERVER_WELCOME))
#endif
{
ACE_TCHAR error_msg[1024];
if(bindip.length() == 0)

0 comments on commit b1b0361

Please sign in to comment.