Browse Source

Fixed issue from last checkin with maintain search view not loading the setting on startup, fixed escape showing up in the search box

sabrogden 5 years ago
parent
commit
8ea60c5505
2 changed files with 4 additions and 0 deletions
  1. 1 0
      Options.cpp
  2. 3 0
      QPasteWnd.cpp

+ 1 - 0
Options.cpp

@@ -203,6 +203,7 @@ void CGetSetOptions::LoadSettings()
 	m_firstTenHotKeysFontSize = GetFirstTenHotKeysFontSize();
 	m_moveSelectionOnOpenHotkey = GetMoveSelectionOnOpenHotkey();
 	m_allowBackToBackDuplicates = GetAllowBackToBackDuplicates();
+	m_maintainSearchView = GetMaintainSearchView();
 
 	GetExtraNetworkPassword(true);
 

+ 3 - 0
QPasteWnd.cpp

@@ -3606,6 +3606,7 @@ bool CQPasteWnd::DoActionCloseWindow()
 		{
 			m_lstHeader.HidePopup(true);
 			Log(_T("close 2"));
+			ret = true;
 		}
 		else if (m_strSQLSearch.IsEmpty() == FALSE)
 		{
@@ -3621,6 +3622,8 @@ bool CQPasteWnd::DoActionCloseWindow()
 				theApp.m_activeWnd.ReleaseFocus();
 
 				Log(_T("close 4"));
+
+				ret = true;
 			}
 			else
 			{