mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 15:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: ConfManager: Simplify applySavedConf().

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2021-05-10 15:49:09 +03:00
parent 64d9be13f8
commit 25fa931443
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/conf/confmanager.cpp
View File

@ -513,14 +513,10 @@ bool ConfManager::saveConf(FirewallConf &conf)
void ConfManager::applySavedConf(FirewallConf *newConf) void ConfManager::applySavedConf(FirewallConf *newConf)
{ {
const bool onlyFlags = !newConf->optEdited(); if (!newConf->anyEdited())
if (onlyFlags && !newConf->anyEdited()) {
if (newConf != conf()) {
newConf->deleteLater(); // RPC leftover
}
return; return;
}
const bool onlyFlags = !newConf->optEdited();
if (conf() != newConf) { if (conf() != newConf) {
if (onlyFlags) { if (onlyFlags) {

4
src/ui/rpc/confmanagerrpc.cpp
View File

@ -63,5 +63,9 @@ bool ConfManagerRpc::saveConf(FirewallConf &newConf)
// Already applied by onConfChanged() & applySavedConf() // Already applied by onConfChanged() & applySavedConf()
newConf.resetEdited(); newConf.resetEdited();
if (&newConf != conf()) {
newConf.deleteLater();
}
return true; return true;
} }