From b8502039edb52c93ef9e1bfac808a86a5d127b4a Mon Sep 17 00:00:00 2001
From:  <alek@codeminders.com>
Date: Sat, 17 May 2008 01:42:12 +0000
Subject: [PATCH] bugfix 2561,2533

---
 src/gui/FWWindow.cpp          | 19 ++++++++--------
 src/gui/NetworkDialogIPv6.cpp |  9 +++++---
 src/gui/ProjectPanel.cpp      | 42 ++++++++++++++++++++---------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp
index 5c425c310..3c6c4ed0e 100644
--- a/src/gui/FWWindow.cpp
+++ b/src/gui/FWWindow.cpp
@@ -226,9 +226,9 @@ void FWWindow::showSub(ProjectPanel *projectW)
     m_space->addSubWindow(sub);
     QIcon p(":Icons/Firewall/icon-tree");
     sub->setWindowIcon(p); 
-    if (projectW->getRCS()!=NULL)
-    {
-        QString FileName = projectW->getRCS()->getFileName();
+//    if (projectW->getRCS()!=NULL)
+ //   {
+        //QString FileName = projectW->getRCS()->getFileName();
         if (st->getInt("Window/maximized")==0)
         {
             sub->showMaximized();
@@ -236,13 +236,14 @@ void FWWindow::showSub(ProjectPanel *projectW)
         else
         {
             sub->show();
-            projectW->loadState();
+            //if (projectW->getRCS()!=NULL)
+                projectW->loadState();
         }
-    }
-    else
-    {
-        sub->showMaximized();
-    }
+//    }
+//    else
+//    {
+//        sub->showMaximized();
+//    }
  
 }
 
diff --git a/src/gui/NetworkDialogIPv6.cpp b/src/gui/NetworkDialogIPv6.cpp
index 7289f41c7..fb694fc87 100644
--- a/src/gui/NetworkDialogIPv6.cpp
+++ b/src/gui/NetworkDialogIPv6.cpp
@@ -124,10 +124,13 @@ void NetworkDialogIPv6::validate(bool *res)
                               tr("&Continue"), 0, 0,
                               0 );
     }
-    try
+    
+    bool ok = false;
+    int range =m_dialog->netmask->text().toInt(&ok); 
+    if (ok&&range>=0&&range<128)
     {
-        Inet6Addr( m_dialog->netmask->text().toLatin1().constData() );
-    } catch (FWException &ex)
+    }
+    else
     {
         *res=false;
         QMessageBox::critical(this, "Firewall Builder",
diff --git a/src/gui/ProjectPanel.cpp b/src/gui/ProjectPanel.cpp
index 34d781697..64828b9d8 100644
--- a/src/gui/ProjectPanel.cpp
+++ b/src/gui/ProjectPanel.cpp
@@ -3187,7 +3187,7 @@ void ProjectPanel::findWhereUsed(FWObject * obj)
 }
 
 void ProjectPanel::showEvent( QShowEvent *ev)
-{
+{   if (rcs!=NULL)
     if (!firstLoad)
     {
     firstLoad=true ;
@@ -3260,6 +3260,16 @@ QString ProjectPanel::getFileName()
 
 void ProjectPanel::saveState ()
 {
+    if (isMaximized ())
+    {
+        st->setInt("Window/maximized",0);
+    }
+    else
+    {
+        st->setInt("Window/maximized",1);
+    }
+
+
     if (rcs!=NULL)
     {
         QString FileName = rcs->getFileName();
@@ -3270,15 +3280,8 @@ void ProjectPanel::saveState ()
             st->setInt("Window/"+FileName+"/width",mdiWindow->width ());
             st->setInt("Window/"+FileName+"/height",mdiWindow->height ());
         }
-        if (isMaximized ())
-        {
-            st->setInt("Window/maximized",0);
-        }
-        else
-        {
-            st->setInt("Window/maximized",1);
-        }
-    }
+
+
 
     oe->hide();
     fd->hide();
@@ -3292,12 +3295,15 @@ void ProjectPanel::saveState ()
     arg = QString("%1,%2").arg(sl[0]).arg(sl[1]);
     if (sl[0] || sl[1])
         st->setStr("Layout/ObjInfoSplitter"+getFileName(), arg );
-
+    
+    }
 }
 
 void ProjectPanel::loadState ()
 {
-    QString FileName = rcs->getFileName();
+    QString FileName ;
+    if (rcs!=NULL) 
+        FileName =rcs->getFileName();
     if (FileName!="")
     {
         if (!mdiWindow->isMaximized ())
@@ -3320,14 +3326,14 @@ void ProjectPanel::loadState ()
     
     if (FileName=="")
     {
-        if (!mdiWindow->isMaximized ())
+        if (st->getInt("Window/maximized")!=0)
         {
-        int y = st->getInt("Window/"+FileName+"/y");
-        int y2 = st->getInt("Window/"+FileName+"/y");
-        firstResize=true ;
+            int y = st->getInt("Window/"+FileName+"/y");
+            int y2 = st->getInt("Window/"+FileName+"/y");
+            firstResize=true ;
         //mdiWindow->resize (600,400);
         //mdiWindow->resize (600,400);
-        mdiWindow->setGeometry (10,10,600,600);
+            mdiWindow->setGeometry (10,10,600,600);
         //mdiWindow->resize (600,800);      
         }
     }
@@ -3346,7 +3352,7 @@ void ProjectPanel::resizeEvent ( QResizeEvent * event )
     {
         loadState();
     } 
-    if (firstResize&&rcs!=NULL)
+    if (firstResize)
     {
         saveState();
     }