From 8ac558bdd7d220a303f66db11ac03edf166f3f2f Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Sun, 2 Sep 2007 23:48:00 +0000
Subject: [PATCH] Fix crash when changing profile after closing un-splitting
 the view.  Remove some dead code.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=707793
---
 src/ViewManager.cpp | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 013d14215..539749c7e 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -294,10 +294,6 @@ void ViewManager::sessionFinished()
 
     Q_ASSERT(session);
 
-    // record the size of the last session
-    //qDebug() << "Recording session size: " << session->size();
-    //setDefaultDisplaySize( session->size().height() , session->size().width() );
-
     // close attached views
     QList<TerminalDisplay*> children = _viewSplitter->findChildren<TerminalDisplay*>();
 
@@ -397,6 +393,15 @@ void ViewManager::removeContainer(ViewContainer* container)
     // so we take the previous container count and work out what the new count
     // would be.
     int previousCount = _viewSplitter->containers().count();
+
+    // remove session map entries for views in this container
+    foreach( QWidget* view , container->views() )
+    {
+        TerminalDisplay* display = qobject_cast<TerminalDisplay*>(view);
+        Q_ASSERT(display);
+        _sessionMap.remove(display);
+    } 
+
     container->deleteLater();
     emit splitViewToggle( (previousCount-1) > 1);
 }
@@ -475,13 +480,6 @@ void ViewManager::createView(Session* session)
         applyProfile(display,session->profileKey());
         
         // set initial size
-#if 0
-        int defaultLines = 0;
-        int defaultColumns = 0;
-        getDefaultDisplaySize(defaultLines,defaultColumns);
-        qDebug() << "Setting default display size to " << QSize(defaultColumns,defaultLines);
-        display->setSize(defaultColumns,defaultLines);
-#endif
         display->setSize(80,40);
 
         ViewProperties* properties = createController(session,display);
@@ -501,21 +499,6 @@ void ViewManager::createView(Session* session)
     }
 }
 
-#if 0
-void ViewManager::getDefaultDisplaySize(int& lines , int& columns) const
-{
-    const KConfigGroup group = KGlobal::config()->group("Last Session");
-    QSize size = group.readEntry("WindowSize",QSize(80,40));
-    lines = size.height();
-    columns = size.width();
-}
-void ViewManager::setDefaultDisplaySize(int lines , int columns)
-{
-    KConfigGroup group = KGlobal::config()->group("Last Session");
-    group.writeEntry("WindowSize",QSize(columns,lines));
-}
-#endif
-
 ViewContainer* ViewManager::createContainer(const QString& profileKey)
 {
     const Profile* info = SessionManager::instance()->profile(profileKey);