Prevent a crash when refreshing a node which has a child with an open…

… dialogue

CHANGELOG

@@ -37,6 +37,8 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2012-11-08 DP  1.16.1  Prevent a crash when refreshing a node which has a
+                       child with an open dialogue [Dhiraj Chawla]
 2012-11-08 DP  1.16.1  Fix dropping/renaming of indexes [Akshay Joshi]
 2012-11-08 DP  1.16.1  Avoid updating the GQB model on every key press in
                        the query tool [Dhiraj Chawla]

pgadmin/frm/events.cpp

@@ -429,11 +429,26 @@ void frmMain::execSelChange(wxTreeItemId item, bool currentNode)
 
 			if (settingRefreshOnClick == REFRESH_OBJECT_ONLY )
 			{
-				//We can not update the schema, because it would cause an update to the entire tree.
+				// We can not update the schema, because it would cause an update to the entire tree.
 				if (currentObject->GetTypeName() != wxT("Schema"))
 				{
 					wxTreeItemId currentItem = currentObject->GetId();
 
+					// Do not refresh and instead bail out if dialog of the currently selected
+					// node or it's child node is open, as refresh would delete this node's object
+					// and could cause a crash
+					pgObject *obj = NULL;
+					if (currentItem)
+						obj = browser->GetObject(currentItem);
+
+					if (obj && obj->CheckOpenDialogs(browser, currentItem))
+					{
+						properties->Freeze();
+						setDisplay(currentObject, properties, sqlPane);
+						properties->Thaw();
+						refresh = true;
+						return;
+					}
 
 					pgObject *newData = currentObject->Refresh(browser, currentItem);
 

pgadmin/schema/pgObject.cpp

@@ -1097,11 +1097,21 @@ bool pgObject::CheckOpenDialogs(ctlTree *browser, wxTreeItemId node)
 		if (obj && obj->GetWindowPtr())
 			return true;
 
+		wxTreeItemIdValue subCookie;
+		wxTreeItemId subChildItem = browser->GetFirstChild(child, subCookie);
 		if (browser->IsExpanded(child))
 		{
 			if (CheckOpenDialogs(browser, child))
 				return true;
 		}
+		// It may be the case the user might have expanded the node opened the
+		// dialog and then collapsed the node again. This case is handled in the
+		// check below
+		else if (subChildItem && browser->GetItemData(subChildItem))
+		{
+			if (CheckOpenDialogs(browser, child))
+				return true;
+		}
 
 		child = browser->GetNextChild(node, cookie);
 	}