--- a/QTfrontend/game.cpp	Thu Sep 21 11:35:20 2006 +0000
+++ b/QTfrontend/game.cpp	Thu Sep 21 17:57:35 2006 +0000
@@ -73,7 +73,7 @@
 
 void HWGame::ClientDisconnect()
 {
-	SaveDemo(cfgdir->absolutePath() + "/Demos/demo.hwd_1");
+	SaveDemo(cfgdir->absolutePath() + "/Demos/LastRound.hwd_1");
     IPCSocket->deleteLater();
 	IPCSocket = 0;
 	deleteLater();
@@ -277,6 +277,9 @@
 
 void HWGame::SaveDemo(const QString & filename)
 {
+	demo->replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
+	demo->replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
+
 	QFile demofile(filename);
 	if (!demofile.open(QIODevice::WriteOnly))
 	{

--- a/QTfrontend/hwform.cpp	Thu Sep 21 11:35:20 2006 +0000
+++ b/QTfrontend/hwform.cpp	Thu Sep 21 17:57:35 2006 +0000
@@ -133,7 +133,7 @@
 void HWForm::GoToDemos()
 {
 	QDir tmpdir;
-	tmpdir.cd(datadir->absolutePath());
+	tmpdir.cd(cfgdir->absolutePath());
 	tmpdir.cd("Demos");
 	tmpdir.setFilter(QDir::Files);
 	ui.pagePlayDemo->DemosList->clear();
@@ -197,7 +197,7 @@
 		return ;
 	}
 	game = new HWGame(config, 0);
-	game->PlayDemo(datadir->absolutePath() + "/Demos/" + curritem->text() + ".hwd_1");
+	game->PlayDemo(cfgdir->absolutePath() + "/Demos/" + curritem->text() + ".hwd_1");
 }
 
 void HWForm::NetConnect()