about summary refs log tree commit diff
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-10-31 18:51:05 +0100
committeroy <Tom_Adams@web.de>2010-10-31 18:51:05 +0100
commit039de7e1ac88219832546219cd6d1e5735183a2e (patch)
tree2e11b7050d13e18e2395be805a65f9fc3ee94216
parent9e39239ce2d8c9397f5bb347930efcfd614ef559 (diff)
downloadzcatch-039de7e1ac88219832546219cd6d1e5735183a2e.tar.gz
zcatch-039de7e1ac88219832546219cd6d1e5735183a2e.zip
fixed infinite loop when playing empty demo. Closes #248
-rw-r--r--src/engine/shared/demo.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 5d82d1c0..fd71443f 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -406,7 +406,13 @@ void CDemoPlayer::DoTick()
 		{
 			// stop on error or eof
 			m_pConsole->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "demo_player", "end of file");
-			Pause();
+			if(m_Info.m_PreviousTick == -1)
+			{
+				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "demo_player", "empty demo");
+				Stop();
+			}
+			else
+				Pause();
 			break;
 		}