[GNUnet-SVN] r7179 - gnunet-qt/src/plugins/fs

[gnunet]

Author: durner
Date: 2008-06-13 14:42:34 -0600 (Fri, 13 Jun 2008)
New Revision: 7179

Modified:
   gnunet-qt/src/plugins/fs/fs.cc
   gnunet-qt/src/plugins/fs/searchController.cc
   gnunet-qt/src/plugins/fs/searchController.h
Log:
don't execute searches twice at the same time

Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc      2008-06-13 15:44:56 UTC (rev 7178)
+++ gnunet-qt/src/plugins/fs/fs.cc      2008-06-13 20:42:34 UTC (rev 7179)
@@ -292,7 +292,7 @@
   else
     uri = GNUNET_ECRS_keyword_string_to_uri(ectx, 
strSearch.toLocal8Bit().data());
 
-  if (uri == NULL)
+  if (uri == NULL || searchCntrl->isActive(uri))
     return;
   
   /* Start search */

Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc        2008-06-13 15:44:56 UTC 
(rev 7178)
+++ gnunet-qt/src/plugins/fs/searchController.cc        2008-06-13 20:42:34 UTC 
(rev 7179)
@@ -271,6 +271,11 @@
         QString::number(availmax) + "%" : ""), Qt::ToolTipRole);
 }
 
+bool GFSSearchController::isActive(GFSEcrsUri uri)
+{
+  return searches.contains(uri);
+}
+
 void GFSSearchController::closed(GFSEcrsUri &uri)
 {
   GNUNET_FSUI_SearchList *list = searches[uri];

Modified: gnunet-qt/src/plugins/fs/searchController.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.h 2008-06-13 15:44:56 UTC (rev 
7178)
+++ gnunet-qt/src/plugins/fs/searchController.h 2008-06-13 20:42:34 UTC (rev 
7179)
@@ -63,6 +63,8 @@
       const struct GNUNET_ECRS_URI *searchURI, int avail, unsigned int cert,
       unsigned int relevance);
 
+  bool isActive(GFSEcrsUri uri);
+  
   static void addSearchResult(QStandardItemModel *model, QModelIndex parent,
     const GNUNET_ECRS_FileInfo *info);
 protected slots: