fix some shutdown issues

This commit is contained in:
Nova 2025-07-23 09:09:17 +03:30
parent a3c413de58
commit b0140e27c9

View File

@ -797,9 +797,6 @@ void MainWindow::on_menu_hotkey_settings_triggered() {
} }
void MainWindow::on_commitDataRequest() { void MainWindow::on_commitDataRequest() {
qDebug() << "Handling DNS setting";
if (Configs::dataStore->system_dns_set) set_system_dns(false, false);
qDebug() << "Done handling DNS setting";
qDebug() << "Start of data save"; qDebug() << "Start of data save";
// //
if (!isMaximized()) { if (!isMaximized()) {
@ -816,6 +813,7 @@ void MainWindow::on_commitDataRequest() {
if (Configs::dataStore->remember_enable && last_id >= 0) { if (Configs::dataStore->remember_enable && last_id >= 0) {
Configs::dataStore->remember_id = last_id; Configs::dataStore->remember_id = last_id;
} }
if (running) running->Save();
// //
Configs::dataStore->Save(); Configs::dataStore->Save();
Configs::profileManager->SaveManager(); Configs::profileManager->SaveManager();
@ -836,13 +834,18 @@ void MainWindow::prepare_exit()
tray->hide(); tray->hide();
Configs::dataStore->prepare_exit = true; Configs::dataStore->prepare_exit = true;
// //
set_spmode_system_proxy(false, false);
RegisterHotkey(true); RegisterHotkey(true);
if (Configs::dataStore->system_dns_set) set_system_dns(false, false);
set_spmode_system_proxy(false, false);
// //
on_commitDataRequest(); on_commitDataRequest();
// //
if (running) running->Save();
Configs::dataStore->save_control_no_save = true; // don't change datastore after this line Configs::dataStore->save_control_no_save = true; // don't change datastore after this line
if (Configs::dataStore->spmode_vpn)
{
profile_stop(false, true);
sem_stopped.acquire();
}
API::defaultClient->Exit(); API::defaultClient->Exit();
mu_exit.unlock(); mu_exit.unlock();
qDebug() << "prepare exit done!"; qDebug() << "prepare exit done!";