Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix stop profile race condition

Browse Source
This commit is contained in:
Nova 2024-09-01 03:42:39 +03:30
parent bee6b0958e
commit 5f07bee684
No known key found for this signature in database
GPG Key ID: 389787EC83F5D73A
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ui/mainwindow_grpc.cpp
View File

@ -372,28 +372,17 @@ void MainWindow::neko_stop(bool crash, bool sem, bool manual) {
return; return;
} }
auto neko_stop_stage2 = [=] { runOnUiThread(
runOnUiThread( [=] {
[=] { while (!NekoGui_sys::running_ext.empty()) {
while (!NekoGui_sys::running_ext.empty()) { auto extC = NekoGui_sys::running_ext.front();
auto extC = NekoGui_sys::running_ext.front(); extC->Kill();
extC->Kill(); NekoGui_sys::running_ext.pop_front();
NekoGui_sys::running_ext.pop_front();
}
},
DS_cores);
NekoGui_traffic::trafficLooper->loop_enabled = false;
NekoGui_traffic::trafficLooper->loop_mutex.lock();
if (NekoGui::dataStore->traffic_loop_interval != 0) {
NekoGui_traffic::trafficLooper->UpdateAll();
for (const auto &item: NekoGui_traffic::trafficLooper->items) {
NekoGui::profileManager->GetProfile(item->id)->Save();
runOnUiThread([=] { refresh_proxy_list(item->id); });
} }
} },
NekoGui_traffic::trafficLooper->loop_mutex.unlock(); DS_cores);
auto neko_stop_stage2 = [=] {
if (!crash) { if (!crash) {
bool rpcOK; bool rpcOK;
QString error = defaultClient->Stop(&rpcOK); QString error = defaultClient->Stop(&rpcOK);
@ -404,16 +393,6 @@ void MainWindow::neko_stop(bool crash, bool sem, bool manual) {
return false; return false;
} }
} }
if (manual) NekoGui::dataStore->UpdateStartedId(-1919);
NekoGui::dataStore->need_keep_vpn_off = false;
running = nullptr;
runOnUiThread([=] {
refresh_status();
refresh_proxy_list(id);
});
return true; return true;
}; };
@ -428,19 +407,38 @@ void MainWindow::neko_stop(bool crash, bool sem, bool manual) {
connect(restartMsgbox, &QMessageBox::accepted, this, [=] { MW_dialog_message("", "RestartProgram"); }); connect(restartMsgbox, &QMessageBox::accepted, this, [=] { MW_dialog_message("", "RestartProgram"); });
auto restartMsgboxTimer = new MessageBoxTimer(this, restartMsgbox, 5000); auto restartMsgboxTimer = new MessageBoxTimer(this, restartMsgbox, 5000);
NekoGui_traffic::trafficLooper->loop_enabled = false;
NekoGui_traffic::trafficLooper->loop_mutex.lock();
if (NekoGui::dataStore->traffic_loop_interval != 0) {
NekoGui_traffic::trafficLooper->UpdateAll();
for (const auto &item: NekoGui_traffic::trafficLooper->items) {
NekoGui::profileManager->GetProfile(item->id)->Save();
refresh_proxy_list(item->id);
}
}
NekoGui_traffic::trafficLooper->loop_mutex.unlock();
restartMsgboxTimer->cancel();
restartMsgboxTimer->deleteLater();
restartMsgbox->deleteLater();
runOnNewThread([=] { runOnNewThread([=] {
// do stop // do stop
MW_show_log(">>>>>>>> " + tr("Stopping profile %1").arg(running->bean->DisplayTypeAndName())); MW_show_log(">>>>>>>> " + tr("Stopping profile %1").arg(running->bean->DisplayTypeAndName()));
if (!neko_stop_stage2()) { if (!neko_stop_stage2()) {
MW_show_log("<<<<<<<< " + tr("Failed to stop, please restart the program.")); MW_show_log("<<<<<<<< " + tr("Failed to stop, please restart the program."));
} }
mu_stopping.unlock();
if (sem) sem_stopped.release(); if (manual) NekoGui::dataStore->UpdateStartedId(-1919);
// cancel timeout NekoGui::dataStore->need_keep_vpn_off = false;
running = nullptr;
runOnUiThread([=] { runOnUiThread([=] {
restartMsgboxTimer->cancel(); refresh_status();
restartMsgboxTimer->deleteLater(); refresh_proxy_list(id);
restartMsgbox->deleteLater();
mu_stopping.unlock();
if (sem) sem_stopped.release();
}); });
}); });
} }