Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #100 from Salanto/Fix-Woopsie2

Browse Source 
Fix Server Crash when deleting statements during recording
This commit is contained in:
Marisa P 2021-04-21 05:51:49 -05:00 committed by GitHub
commit 3e490252be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/casing.cpp
View File

@ -107,7 +107,6 @@ void AOClient::cmdTestify(int argc, QStringList argv)
} }
else { else {
clearTestimony(); clearTestimony();
area->statement = 0;
area->test_rec = AreaData::TestimonyRecording::RECORDING; area->test_rec = AreaData::TestimonyRecording::RECORDING;
sendServerMessage("Started testimony recording."); sendServerMessage("Started testimony recording.");
} }
@ -157,6 +156,7 @@ void AOClient::cmdDeleteStatement(int argc, QStringList argv)
} }
if (c_statement > 0 && area->testimony.size() > 2) { if (c_statement > 0 && area->testimony.size() > 2) {
area->testimony.remove(c_statement); area->testimony.remove(c_statement);
area->statement = c_statement - 1;
sendServerMessage("The statement with id " + QString::number(c_statement) + " has been deleted from the testimony."); sendServerMessage("The statement with id " + QString::number(c_statement) + " has been deleted from the testimony.");
} }
} }

2
src/packets.cpp
View File

@ -734,7 +734,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
if (args[5] != "wit") if (args[5] != "wit")
return AOPacket("MS", args); return AOPacket("MS", args);
if (area->statement == 0) { if (area->statement == -1) {
args[4] = "~~\\n-- " + args[4] + " --"; args[4] = "~~\\n-- " + args[4] + " --";
args[14] = "3"; args[14] = "3";
server->broadcast(AOPacket("RT",{"testimony1"}), current_area); server->broadcast(AOPacket("RT",{"testimony1"}), current_area);

7
src/testimony_recorder.cpp
View File

@ -23,15 +23,15 @@ void AOClient::addStatement(QStringList packet)
{ {
AreaData* area = server->areas[current_area]; AreaData* area = server->areas[current_area];
int c_statement = area->statement; int c_statement = area->statement;
if (c_statement >= 0) { if (c_statement >= -1) {
if (area->test_rec == AreaData::TestimonyRecording::RECORDING) { if (area->test_rec == AreaData::TestimonyRecording::RECORDING) {
if (c_statement <= server->maximum_statements) { if (c_statement <= server->maximum_statements) {
if (c_statement == 0) if (c_statement == -1)
packet[14] = "3"; packet[14] = "3";
else else
packet[14] = "1"; packet[14] = "1";
area->testimony.append(packet);
area->statement = c_statement + 1; area->statement = c_statement + 1;
area->testimony.append(packet);
return; return;
} }
else { else {
@ -70,6 +70,7 @@ void AOClient::clearTestimony()
{ {
AreaData* area = server->areas[current_area]; AreaData* area = server->areas[current_area];
area->test_rec = AreaData::TestimonyRecording::STOPPED; area->test_rec = AreaData::TestimonyRecording::STOPPED;
area->statement = -1;
area->testimony.clear(); //!< Empty out the QVector area->testimony.clear(); //!< Empty out the QVector
area->testimony.squeeze(); //!< Release memory. Good idea? God knows, I do not. area->testimony.squeeze(); //!< Release memory. Good idea? God knows, I do not.
} }