onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 11:47:24 +01:00
Code Issues Releases Wiki Activity

fixed #1837

Browse Source 
"generated script gets .fw suffix even when user set output file
name". Suffix .fw should not be appended to the name entered by
the user in the "output file name" input field in the firewall
settings dialog.
This commit is contained in:
Vadim Kurland 2010-11-10 16:25:10 -08:00
parent d36b2e0a76
commit c76531c8df
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ChangeLog
View File

@ -1,5 +1,11 @@
2010-11-10 Vadim Kurland <vadim@vk.crocodile.org>
* FirewallInstaller.cpp (getGeneratedFileFullPath): fixed #1837
"generated script gets .fw suffix even when user set output file
name". Suffix .fw should not be appended to the name entered by
the user in the "output file name" input field in the firewall
settings dialog.
* PolicyCompiler_ipfw_writers.cpp (processNext): fixed #1836
"installer hangs and fails after activation of ipfw policy". As
soon as .fw script swapped ipfw sets usig command "ipfw sawp" and

4
src/libgui/FirewallInstaller.cpp
View File

@ -820,9 +820,7 @@ QString FirewallInstaller::getGeneratedFileFullPath(Firewall *fw)
QString ofname = QString::fromUtf8(fwopt->getStr("output_file").c_str());
if (!ofname.isEmpty())
{
QFileInfo fi(ofname);
if (fi.suffix() != "fw") generated_file = ofname + ".fw";
else generated_file = ofname;
generated_file = ofname;
} else
generated_file = QString::fromUtf8(fw->getName().c_str()) + ".fw";