diff --git a/doc/ChangeLog b/doc/ChangeLog index 68d4c8bbb..a59f125b6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2011-02-27 vadim + + * instDialog_ui_ops.cpp (readInstallerOptionsFromFirewallObject): + fixes #2160 "Installer reports error "Generated script file + .fw not found."". The problem was intorduced earlier + while fixing #2047 + 2011-02-26 vadim * DiscoveryDruid.cpp (finishClicked): see #2153 "Add Network Zone diff --git a/src/libgui/instDialog_ui_ops.cpp b/src/libgui/instDialog_ui_ops.cpp index d06c2788b..7a71735a4 100644 --- a/src/libgui/instDialog_ui_ops.cpp +++ b/src/libgui/instDialog_ui_ops.cpp @@ -1235,8 +1235,8 @@ void instDialog::readInstallerOptionsFromFirewallObject(Firewall *fw) * the .fwb file is located, except if user specified full path * in the advaced settings dialog. */ -// cnf.script = FirewallInstaller::getGeneratedFileFullPath(fw); - cnf.script = FirewallInstaller::getGeneratedFileName(fw); + cnf.script = FirewallInstaller::getGeneratedFileFullPath(fw); +// cnf.script = FirewallInstaller::getGeneratedFileName(fw); cnf.remote_script = ""; // filled in FirewallInstaller::readManifest() cnf.fwbfile = project->db()->getFileName().c_str(); cnf.wdir = getFileDir( project->getRCS()->getFileName() );