Skip to content

Commit 22a9414

Browse files
Fix logging (#1118)
* not a demo server OR demo logging enabled * dont always create the demo server * stray space --------- Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>
1 parent 461fb81 commit 22a9414

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/aoapplication.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void AOApplication::construct_lobby()
6262
{
6363
demo_server->deleteLater();
6464
}
65-
demo_server = new DemoServer(this);
65+
6666
w_lobby->show();
6767
}
6868

src/lobby.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,13 +433,19 @@ void Lobby::on_demo_clicked(QTreeWidgetItem *item, int column)
433433
return;
434434
}
435435

436+
if (ao_app->demo_server)
437+
{
438+
ao_app->demo_server->deleteLater();
439+
}
440+
ao_app->demo_server = new DemoServer(this);
441+
436442
QString l_filepath = (get_app_path() + "/logs/%1/%2").arg(item->data(0, Qt::DisplayRole).toString(), item->data(1, Qt::DisplayRole).toString());
437443
ao_app->demo_server->start_server();
438-
ServerInfo demo_server;
439-
demo_server.address = "127.0.0.1";
440-
demo_server.port = ao_app->demo_server->port();
444+
ServerInfo demo_server_connection;
445+
demo_server_connection.address = "127.0.0.1";
446+
demo_server_connection.port = ao_app->demo_server->port();
441447
ao_app->demo_server->set_demo_file(l_filepath);
442-
net_manager->connect_to_server(demo_server);
448+
net_manager->connect_to_server(demo_server_connection);
443449
}
444450

445451
void Lobby::onReloadThemeRequested()

src/packet_distribution.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void AOApplication::server_packet_received(AOPacket packet)
167167

168168
QString server_name_stripped = server_name;
169169
static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']");
170-
if (Options::getInstance().logToDemoFileEnabled() && !demo_server)
170+
if (Options::getInstance().logToDemoFileEnabled() || !demo_server)
171171
{
172172
this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'");
173173
this->write_to_file("Joined server " + server_name_stripped + " hosted on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true);

0 commit comments

Comments
 (0)