From 7b0573c47837c9420d9732c80826a2b3b51455f0 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sun, 30 Jan 2011 14:46:07 -0800 Subject: [PATCH] see #2006 clearing editor panel when data file panel is closed; new build 3455 --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 8 ++++++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/libgui/FWWindow_editor.cpp | 1 + 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index e8fa6ad4b..765d4eabe 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3454" +BUILD_NUM="3455" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 1757e8dde..947b165e3 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3454" +#define VERSION "4.2.0.3455" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 43c81a3aa..2498300e4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2011-01-30 vadim + + * FWWindow_editor.cpp (clearEditorAndSearchPanels): see #2006 + "Crash when closing editor panel with find-and-replace". The GUI + crashed if user tried to close editor panel at the bottom after + closing objects+rules panel and while some object was still + displayed in the editor. + 2011-01-28 vadim * newFirewallDialog.cpp (fillInterfaceNZList): fixes #2000 "New diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index cc9580fc5..85d548899 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3454 +%define version 4.2.0.3455 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index b74d400a7..3c344508c 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3454-1 +Version: 4.2.0.3455-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index e3844be6d..49f859f1e 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3454 +%define version 4.2.0.3455 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/libgui/FWWindow_editor.cpp b/src/libgui/FWWindow_editor.cpp index 1d2a5e5de..3d50eb983 100644 --- a/src/libgui/FWWindow_editor.cpp +++ b/src/libgui/FWWindow_editor.cpp @@ -106,6 +106,7 @@ void FWWindow::clearEditorAndSearchPanels() { findWhereUsedWidget->clear(); findObjectWidget->clear(); + if (oe != NULL) oe->blank(); } void FWWindow::openEditorPanel()