Disable find/next previous actions before deleting the objects which they rely on. ++ Preconditions.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=691508
wilder-portage
Robert Knight 19 years ago
parent 1421ee66ed
commit 15fc19e0a8
  1. 5
      src/SessionController.cpp

@ -675,11 +675,12 @@ void SessionController::searchHistory(bool showSearchBar)
} }
else else
{ {
setFindNextPrevEnabled(false);
disconnect( _searchBar , SIGNAL(searchChanged(const QString&)) , this , disconnect( _searchBar , SIGNAL(searchChanged(const QString&)) , this ,
SLOT(searchTextChanged(const QString&)) ); SLOT(searchTextChanged(const QString&)) );
removeSearchFilter(); removeSearchFilter();
setFindNextPrevEnabled(false);
_view->setFocus( Qt::ActiveWindowFocusReason ); _view->setFocus( Qt::ActiveWindowFocusReason );
} }
@ -753,12 +754,14 @@ void SessionController::highlightMatches(bool highlight)
void SessionController::findNextInHistory() void SessionController::findNextInHistory()
{ {
Q_ASSERT( _searchBar ); Q_ASSERT( _searchBar );
Q_ASSERT( _searchFilter );
beginSearch(_searchBar->searchText(),SearchHistoryTask::ForwardsSearch); beginSearch(_searchBar->searchText(),SearchHistoryTask::ForwardsSearch);
} }
void SessionController::findPreviousInHistory() void SessionController::findPreviousInHistory()
{ {
Q_ASSERT( _searchBar ); Q_ASSERT( _searchBar );
Q_ASSERT( _searchFilter );
beginSearch(_searchBar->searchText(),SearchHistoryTask::BackwardsSearch); beginSearch(_searchBar->searchText(),SearchHistoryTask::BackwardsSearch);
} }

Loading…
Cancel
Save