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

fixed #1544 "fwbuilder crashes during import of file with rtf

Browse Source 
formatting data". The fix should prevent crashes in other cases
when import was unsuccessful.
This commit is contained in:
Vadim Kurland 2010-07-14 19:26:11 +00:00
parent eda31e4fc3
commit 73e1ee1f0d
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 3063
#define BUILD_NUM 3080

7
doc/ChangeLog
View File

@ -1,3 +1,10 @@
2010-07-14 Vadim Kurland <vadim@vk.crocodile.org>
* DiscoveryDruid.cpp (DiscoveryDruid::loadDataFromImporter):
fixed #1544 "fwbuilder crashes during import of file with rtf
formatting data". The fix should prevent crashes in other cases
when import was unsuccessful.
2010-07-13 Roman Bovsunivskiy <a2k0001@gmail.com>
* instdialogoptions_q.ui: Added "Cancell All" button to stop all
firewalls installations, renamed OK button to "Install"

32
src/gui/DiscoveryDruid.cpp
View File

@ -1315,24 +1315,28 @@ void DiscoveryDruid::loadDataFromImporter()
if (imp!=NULL)
{
Firewall *fw = imp->finalize();
ProjectPanel *pp = mw->activeProject();
QString filename = pp->getFileName();
//pp->m_panel->om->reload();
//pp->m_panel->om->autoRenameChildren(fw, "");
if (fw) // fw can be NULL if import was uncussessful
{
QCoreApplication::postEvent(mw, new reloadObjectTreeEvent(filename));
if (mw->isEditorVisible())
ProjectPanel *pp = mw->activeProject();
QString filename = pp->getFileName();
//pp->m_panel->om->reload();
//pp->m_panel->om->autoRenameChildren(fw, "");
QCoreApplication::postEvent(mw, new reloadObjectTreeEvent(filename));
if (mw->isEditorVisible())
QCoreApplication::postEvent(
mw, new openObjectInEditorEvent(filename, fw->getId()));
QCoreApplication::postEvent(
mw, new openObjectInEditorEvent(filename, fw->getId()));
QCoreApplication::postEvent(
mw, new showObjectInTreeEvent(filename, fw->getId()));
mw, new showObjectInTreeEvent(filename, fw->getId()));
// Open first created Policy ruleset object
FWObject *first_policy = fw->getFirstByType(Policy::TYPENAME);
if (first_policy)
QCoreApplication::postEvent(
mw, new openRulesetEvent(filename, first_policy->getId()));
// Open first created Policy ruleset object
FWObject *first_policy = fw->getFirstByType(Policy::TYPENAME);
if (first_policy)
QCoreApplication::postEvent(
mw, new openRulesetEvent(filename, first_policy->getId()));
}
}
}