Merge branch 'master' of github.com:pcbsd/pcbsd

trueos · Nov 7, 2013 · 1e75537 · 1e75537
2 parents 8afc51a + d44b108
commit 1e75537
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src-qt4/pc-softwaremanager/extras.h b/src-qt4/pc-softwaremanager/extras.h
@@ -109,7 +109,7 @@ class Extras{
    QString out = name.toLower();
    out.remove(" ");
    out.remove("\t");
-   out.simplified();
+   out = out.simplified();
    return out;
  }
 

diff --git a/src-qt4/pc-softwaremanager/pbiBackend.cpp b/src-qt4/pc-softwaremanager/pbiBackend.cpp
@@ -1131,11 +1131,8 @@ void PBIBackend::slotProcessError(int ID, QStringList log){
      }
    }
    else if(ID == ProcessManager::DOWNLOAD){ 
-     if(!sDownload){ //not stopped manually
+       //The ProcessFinished function has a bit more robust check for download failures
-       if(APPHASH.contains(cDownload)){name = APPHASH[cDownload].name; }
+       //       - use it instead to prevent duplicate error messages
-       title = QString(tr("%1 Download Error:")).arg(name);
-       message = tr("The download process experienced an error and could not be completed");
-     }
    }
    else if(ID == ProcessManager::OTHER){ 
      if(PBIHASH.contains(cOther)){name = PBIHASH[cOther].name; }

diff --git a/src-qt4/pc-softwaremanager/pbiDBAccess.cpp b/src-qt4/pc-softwaremanager/pbiDBAccess.cpp
@@ -361,6 +361,6 @@ QString PBIDBAccess::runCMD(QString cmd){
     output = "Process timed out (30 sec)";
   }
   if(output.endsWith("\n")){ output.chop(1); }
-  output.simplified();
+  output = output.simplified();
   return output;
 }