fix a crash when a view is closed

in multi split class, the previous focus pane was badly determined

Author: cbucher

Console/TabView.cpp

@@ -493,9 +493,9 @@ void TabView::Split(CMultiSplitPane::SPLITTYPE splitType)
 		HWND hwndConsoleView = CreateNewConsole(&consoleViewCreate, strCurrentDirectory, wstring(L""), activeConsoleView->GetBasePriority());
 		if( hwndConsoleView )
 		{
-			multisplitClass::SetDefaultFocusPane(multisplitClass::defaultFocusPane->split(
+			multisplitClass::Split(
 				hwndConsoleView,
-				splitType));
+				splitType);
 
 			CRect clientRect(0, 0, 0, 0);
 			AdjustRectAndResize(ADJUSTSIZE_WINDOW, clientRect, WMSZ_BOTTOM);
@@ -529,18 +529,7 @@ bool TabView::CloseView(HWND hwnd, bool boolDetach, bool& boolTabClosed)
 			iter->second->DestroyWindow();
 			m_views.erase(iter);
 
-#ifdef _DEBUG
-			ATLTRACE(L"%p-TabView::CloseView tree\n",
-				::GetCurrentThreadId());
-			multisplitClass::tree.dump(0, 0);
-			ATLTRACE(L"%p-TabView::CloseView defaultFocusPane\n",
-				::GetCurrentThreadId());
-			if( multisplitClass::defaultFocusPane )
-				multisplitClass::defaultFocusPane->dump(0, multisplitClass::defaultFocusPane->parent);
-#endif
-
-			if( multisplitClass::defaultFocusPane )
-				multisplitClass::SetDefaultFocusPane(multisplitClass::defaultFocusPane->remove());
+			multisplitClass::Remove();
 
 			if( m_views.empty() )
 				boolTabClosed = true;

wtl/wtl/include/multisplit.h

@@ -951,15 +951,7 @@ namespace WTL
 			bool boolNotify = newDefaultPane != this->defaultFocusPane;
 
 			if( boolNotify )
-			{
-				// if defaultFocusPane is not a window
-				// then defaultFocusPane has been split
-				// pane0 is used as new previousFocusPane
-				if( this->defaultFocusPane->pane0 )
-					this->previousFocusPane = this->defaultFocusPane->pane0;
-				else
-					this->previousFocusPane = this->defaultFocusPane;
-			}
+				this->previousFocusPane = this->defaultFocusPane;
 
 			this->defaultFocusPane = newDefaultPane;
 			if( bAppActive && newDefaultPane && ::IsWindow(newDefaultPane->window) )
@@ -994,6 +986,44 @@ namespace WTL
 			return false;
 		}
 
+		bool Split(HWND windowPane1, CMultiSplitPane::SPLITTYPE splitType)
+		{
+			if( this->defaultFocusPane == nullptr )
+				return false;
+
+			CMultiSplitPane* pane1 = this->defaultFocusPane->split(
+				windowPane1,
+				splitType);
+
+			if( pane1 == nullptr )
+				return false;
+
+			// defaultFocusPane has been split
+			// pane0 must be used as new previousFocusPane
+			this->defaultFocusPane = this->defaultFocusPane->pane0;
+			this->SetDefaultFocusPane(pane1);
+
+			return true;
+		}
+
+		bool Remove()
+		{
+#ifdef _DEBUG
+			ATLTRACE(L"%p-TabView::CloseView tree\n", ::GetCurrentThreadId());
+			this->tree.dump(0, 0);
+			ATLTRACE(L"%p-TabView::CloseView defaultFocusPane\n", ::GetCurrentThreadId());
+			if( this->defaultFocusPane )
+				this->defaultFocusPane->dump(0, this->defaultFocusPane->parent);
+#endif
+
+			if( this->defaultFocusPane )
+				this->SetDefaultFocusPane(this->defaultFocusPane->remove());
+			else
+				return false;
+
+			return true;
+		}
+
 		virtual void OnPaneChanged(void)
 		{
 		}