Index: rts/Game/GameServer.h
===================================================================
--- rts/Game/GameServer.h	(Revision 5092)
+++ rts/Game/GameServer.h	(Arbeitskopie)
@@ -58,8 +58,6 @@
 	Currently only sets serverframenum
 	*/
 	void SkipTo(int targetframe);
-	
-	void CreateNewFrame(bool fromServerThread=false);
 
 	bool WaitsOnCon() const;
 	
@@ -67,7 +65,7 @@
 	
 	void SetGamePausable(const bool arg);
 	
-#ifdef DEBUG
+#ifdef DEBUG || !NO_AVI
 	bool gameClientUpdated;			//used to prevent the server part to update to fast when the client is mega slow (running some sort of debug mode)
 #endif
 	
@@ -92,6 +90,7 @@
 	void StartGame();
 	void UpdateLoop();
 	void Update();
+	void CreateNewFrame();
 	void CheckSync();
 	void ServerReadNet();
 	void CheckForGameEnd();
Index: rts/Game/GameServer.cpp
===================================================================
--- rts/Game/GameServer.cpp	(Revision 5092)
+++ rts/Game/GameServer.cpp	(Arbeitskopie)
@@ -309,7 +309,7 @@
 
 	if (serverframenum > 0 && !play)
 	{
-		CreateNewFrame(true);
+		CreateNewFrame();
 	}
 	serverNet->Update();
 
@@ -721,7 +721,7 @@
 	}
 	timeLeft=0;
 	lastTick = SDL_GetTicks()-1;
-	CreateNewFrame(true);
+	CreateNewFrame();
 }
 
 void CGameServer::SetGamePausable(const bool arg)
@@ -761,7 +761,7 @@
 	}
 }
 
-void CGameServer::CreateNewFrame(bool fromServerThread)
+void CGameServer::CreateNewFrame()
 {
 	CheckSync();
 
@@ -773,31 +773,33 @@
 	}
 
 #ifdef DEBUG
-	if(gameClientUpdated){
+	if (gameClientUpdated)
 		gameClientUpdated=false;
-	}
+	else
+		return;
 #endif
+	
+#ifndef NO_AVI
+	if (!game || !game->creatingVideo || gameClientUpdated)
+		gameClientUpdated=false;
+	else
+		return;
+#endif
 
 	timeLeft+=GAME_SPEED*internalSpeed*float(timeElapsed)/1000.0f;
 	lastTick=currentTick;
 
 	while((timeLeft>0) && !IsPaused)
 	{
-#ifndef NO_AVI
-		if((!game || !game->creatingVideo) || !fromServerThread)
-#endif
-		{
-			boost::mutex::scoped_lock scoped_lock(gameServerMutex,!fromServerThread);
-			if (nextserverframenum!=0) {
-				serverframenum = nextserverframenum;
-				nextserverframenum = 0;
-			} else
-				serverframenum++;
-			serverNet->SendNewFrame(serverframenum);
+		if (nextserverframenum!=0) {
+			serverframenum = nextserverframenum;
+			nextserverframenum = 0;
+		} else
+			serverframenum++;
+		serverNet->SendNewFrame(serverframenum);
 #ifdef SYNCCHECK
-			outstandingSyncFrames.push_back(serverframenum);
+		outstandingSyncFrames.push_back(serverframenum);
 #endif
-		}
 		timeLeft--;
 	}
 }
@@ -937,6 +939,13 @@
 			}
 		}
 	}
+	else if ((msg.find(".singlestep") == 0) && (players[player]->hasRights)) {
+		if (IsPaused)
+		{
+			gameClientUpdated = true;
+			CreateNewFrame();
+		}
+	}
 	else {
 		serverNet->SendChat(player, msg);
 		if (hostif) {
Index: rts/Game/Game.cpp
===================================================================
--- rts/Game/Game.cpp	(Revision 5092)
+++ rts/Game/Game.cpp	(Arbeitskopie)
@@ -1123,7 +1123,7 @@
 		}
 	}
 	else if (cmd == "singlestep") {
-		gameServer->CreateNewFrame(false);
+		net->SendChat(gu->myPlayerNum, ".singlestep");
 	}
 	else if (cmd == "debug") {
 		gu->drawdebug = !gu->drawdebug;
@@ -1856,7 +1856,7 @@
 	UpdateUI();
 	net->Update();
 
-#ifdef DEBUG
+#ifdef DEBUG || !NO_AVI
 	if(gameServer)
 		gameServer->gameClientUpdated=true;
 #endif
@@ -1866,10 +1866,6 @@
 		gameServer->Update();
 #endif
 
-	if(creatingVideo && playing && gameServer){
-		gameServer->CreateNewFrame();
-	}
-
 	if(!ClientReadNet()){
 		logOutput.Print("Client read net wanted quit");
 		return false;