- always try and hide window regardless of global setting

- don't minimize description window on escape

QPasteWnd.cpp

@@ -687,7 +687,6 @@ BOOL CQPasteWnd::HideQPasteWindow (bool releaseFocus, bool clearSearchData)
     if(!theApp.m_bShowingQuickPaste)
     {
         Log(_T("End of HideQPasteWindow, !theApp.m_bShowingQuickPaste"));
-        return FALSE;
     }
 
 	{
@@ -3269,14 +3268,18 @@ bool CQPasteWnd::DoActionCloseWindow()
 	}
 	else
 	{
+		Log(_T("close 1"));
+
 		if (m_lstHeader.IsToolTipShowPersistant() == false &&
 			m_lstHeader.IsToolTipWindowVisible())
 		{
 			m_lstHeader.HidePopup(true);
+			Log(_T("close 2"));
 		}
 		else if (m_strSQLSearch.IsEmpty() == FALSE)
 		{
 			OnCancelFilter(0, 0);
+			Log(_T("close 3"));
 			ret = true;
 		}
 		else
@@ -3285,6 +3288,8 @@ bool CQPasteWnd::DoActionCloseWindow()
 			{
 				MinMaxWindow(FORCE_MIN);
 				theApp.m_activeWnd.ReleaseFocus();
+
+				Log(_T("close 4"));
 			}
 			else
 			{
@@ -3292,11 +3297,14 @@ bool CQPasteWnd::DoActionCloseWindow()
 				{
 					HideQPasteWindow(true);
 					ret = true;
+					Log(_T("close 5"));
 				}
 			}
 		}
 	}
 
+	Log(_T("close 6"));
+
 	return ret;
 }
 

ToolTipEx.cpp

@@ -364,14 +364,14 @@ BOOL CToolTipEx::PreTranslateMessage(MSG *pMsg)
 			switch (a.Cmd)
 			{
 			case ActionEnums::CLOSEWINDOW:
-				if (this->m_showPersistant &&
+				/*if (this->m_showPersistant &&
 					m_DittoWindow.m_bMinimized == false)
 				{
 					m_DittoWindow.MinMaxWindow(this, FORCE_MIN);
 					theApp.m_activeWnd.ReleaseFocus();
 
 					return TRUE;
-				}
+				}*/
 				break;
 			}
 		}