Thread: [fwbuilder-commits] r3045 - branches/v4_0/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2010-06-30 15:32:43
|
Author: a2k Date: 2010-06-30 08:32:34 -0700 (Wed, 30 Jun 2010) New Revision: 3045 Modified: branches/v4_0/src/gui/FWWindowPrint.cpp branches/v4_0/src/gui/RuleSetView.cpp Log: Fixed #1533: printing from command line works now Modified: branches/v4_0/src/gui/FWWindowPrint.cpp =================================================================== --- branches/v4_0/src/gui/FWWindowPrint.cpp 2010-06-30 14:24:28 UTC (rev 3044) +++ branches/v4_0/src/gui/FWWindowPrint.cpp 2010-06-30 15:32:34 UTC (rev 3045) @@ -49,6 +49,7 @@ #include <QMdiArea> #include <QMdiSubWindow> #include <QtDebug> +#include <QFile> using namespace libfwbuilder; using namespace std; @@ -256,9 +257,23 @@ return; } + if (!QFile::exists(fileName)) + { + qDebug() << "Input file does not exist"; + return; + } FWObjectDatabase * objdb = new FWObjectDatabase(); QPrinter *printer = new QPrinter(QPrinter::HighResolution); - objdb->load(fileName.toLatin1().constData(), NULL,librespath); + try + { + objdb->load(fileName.toLatin1().constData(), NULL,librespath); + } + catch (...) + { + qDebug() << "Could not read input file"; + return; + } + FWObject* obj = objdb->findObjectByName(Firewall::TYPENAME, firewallName.toAscii().data()); if (obj!=NULL) Modified: branches/v4_0/src/gui/RuleSetView.cpp =================================================================== --- branches/v4_0/src/gui/RuleSetView.cpp 2010-06-30 14:24:28 UTC (rev 3044) +++ branches/v4_0/src/gui/RuleSetView.cpp 2010-06-30 15:32:34 UTC (rev 3045) @@ -2385,7 +2385,10 @@ t.start(); RuleSetModel* md = ((RuleSetModel*)model()); QStringList collapsed_groups; - QString filename = project->getRCS()->getFileName(); + QString filename; + if (project != NULL) + filename = project->getRCS()->getFileName(); + else filename = ""; if (fwbdebug) qDebug("restoreCollapsedGroups begin: %d ms", t.restart()); Firewall *f = md->getFirewall(); |