mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-22 14:10:54 -04:00
ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
063a366d12
commit
c6c8e63e91
12 changed files with 153 additions and 233 deletions
|
@ -824,9 +824,6 @@ void SearchDialog::insertFile(const std::string& txt,qulonglong searchId, const
|
|||
|
||||
if(nb_results[searchId] >= ui._max_results_SB->value())
|
||||
return ;
|
||||
else
|
||||
++nb_results[searchId] ;
|
||||
|
||||
|
||||
// 1 - look in result window whether the file already exists.
|
||||
//
|
||||
|
@ -957,6 +954,8 @@ void SearchDialog::insertFile(const std::string& txt,qulonglong searchId, const
|
|||
|
||||
if(!found)
|
||||
{
|
||||
++nb_results[searchId] ;
|
||||
|
||||
/* translate search results */
|
||||
|
||||
QTreeWidgetItem *item = new QTreeWidgetItem();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue