fix #1494 - download of file when search is canceled

1 files changed, 6 insertions, 1 deletions

diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 3c096ed..7426e80 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -575,56 +575,59 @@ void LibraryDialog::cancelIt()
 
 bool LibraryDialog::setTitle()
 {
         Config config("Gutenbrowser");
         odebug << "setting title" << oendl;
         odebug << DlglistItemTitle << oendl;
 
         if( DlglistItemTitle.find("[",0,TRUE) != -1)
                 DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
         if( DlglistItemTitle.find("]",0,TRUE) !=-1)
                 DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
         odebug << "Title being set is "+DlglistItemTitle << oendl;
         int test = 0;
         QString ramble, temp;
         config.setGroup("Files");
         QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
         int  i_numofFiles = s_numofFiles.toInt();
         for ( int i = 0; i <= i_numofFiles; i++){
                 temp.setNum( i);
                 ramble  = config.readEntry( temp, "" );
                 if( strcmp( ramble, File_Name) == 0){
                         test = 1;
                 }
         }
+
+		if(test == 0 ) {
+
         config.setGroup("Files");
         config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
         QString interger;
         interger.setNum( i_numofFiles +1);
         config.writeEntry( interger, File_Name);
         config.setGroup( "Titles" );
         config.writeEntry( File_Name, DlglistItemTitle);
-
+		}
         test = 0;
         return true;
 }
 
 
 void LibraryDialog::saveConfig()
 {
         Config config("Gutenbrowser");
         if( httpBox->isChecked() == TRUE) {
                 checked = 1;
                 config.setGroup( "Proxy" );
                 config.writeEntry("IsChecked", "TRUE");
         } else {
                 checked = 0;
                 config.setGroup( "Proxy" );
                 config.writeEntry("IsChecked", "FALSE");
         }
         if (authBox->isChecked() == TRUE) {
                 config.setGroup("SortAuth");
                 config.writeEntry("authSort", "TRUE");
         } else {
                 config.setGroup("SortAuth");
                 config.writeEntry("authSort", "FALSE");
         }
@@ -726,48 +729,50 @@ void LibraryDialog::onButtonSearch()
                         for ( ; it5.current(); ++it5 )  {
                                 resultString = ( it5.current() )->text(0);
                                 resultString += (" : ");
                                 resultString += ( it5.current() )->text(2);
                                 resultString += (" : ");
                                 resultString += ( it5.current() )->text(3);
                                 if( resultString.find( searcherStr, 0, cS) != -1) {
                                         Searchlist.append( resultString);
                                 }
                         }
                 }
 
                 tabWidget->setCurrentPage( curTab);
 
                 Searchlist.sort();
                 SearchResultsDlg* SearchResultsDialog;
                 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
 
                 SearchResultsDialog->showMaximized();
                 if( SearchResultsDialog->exec() != 0) {
                         texter = SearchResultsDialog->selText;
                             //           odebug << texter << oendl;
                         resultLs= SearchResultsDialog->resultsList;
                         i_berger = 1;
+                } else {
+										resultLs.clear();
                 }
                 Searchlist.clear();
 
                     //        if(SearchResultsDialog)
                     //        delete SearchResultsDialog;
                 QString tester;
                 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
                         texter.sprintf("%s \n",(*it).latin1());
                             //           odebug << texter << oendl;
                         if( tester!=texter)
                                 parseSearchResults( texter);
                         tester = texter;
                 }
                 if(searchDlg)
                         delete searchDlg;
         }
         if(checkBox->isChecked() ) {
                 accept();
         } else {
                 setActiveWindow();
         }
 }
 
   /*