eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

maybe bug fix for mac server logging problem, added zip for deploying on mac to include COPYING file

Browse source
This commit is contained in:
Volker Fischer 2010-03-14 15:51:22 +00:00
parent 8950e897f0
commit 3fae9fb1cf
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mac/deploy_mac.sh
View file

@ -4,4 +4,6 @@ rm -rf llcon.app
make clean make clean
make -j2 make -j2
macdeployqt llcon.app -dmg macdeployqt llcon.app -dmg
zip llcon-version-mac.zip llcon.dmg COPYING
rm llcon.dmg
cd mac cd mac

7
src/server.cpp
View file

@ -354,6 +354,12 @@ void CServer::Start()
} }
void CServer::Stop() void CServer::Stop()
{
// Under Mac we have the problem that the timer shutdown might
// take some time and therefore we get a lot of "server stopped"
// entries in the log. The following condition shall prevent this.
// For the other OSs this should not hurt either.
if ( IsRunning() )
{ {
// stop timer // stop timer
HighPrecisionTimer.Stop(); HighPrecisionTimer.Stop();
@ -361,6 +367,7 @@ void CServer::Stop()
// logging (add "server stopped" logging entry) // logging (add "server stopped" logging entry)
Logging.AddServerStopped(); Logging.AddServerStopped();
} }
}
void CServer::OnTimer() void CServer::OnTimer()
{ {