1 files changed, 10 insertions, 1 deletions

diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index b892b30..be20c71 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -12,59 +12,68 @@ PackageList::PackageList()
 {
   empty=true;
   sections << "All";
   subSections.insert("All", new QStringList() );
   QStringList *ss = subSections["All"];
   *ss << "All";
   aktSection = "All";
   aktSubSection = "All";
 }
 
 PackageList::PackageList( PackageManagerSettings* s)
   : packageIter( packageList )
 {
   settings = s;
   PackageList();
 }
 
 PackageList::~PackageList()
 {
 }
 
 /** Inserts a package into the list */
 void PackageList::insertPackage( Package* pack )
 {
+        if (!pack) return;
   Package* p = packageList.find( pack->name() );
   if ( p )
     {
+      if ( p->version() == pack->version() )
+      {
       p->copyValues( pack );
       delete pack;
       pack = p;
     }else{
+               p->setName( pack->name()+"["+p->version()+"]" );
+               pack->setName( pack->name()+"["+pack->version()+"]" );
+                                packageList.insert( pack->name(), pack );
+              origPackageList.insert( pack->name(), pack );
+      }
+    }else{
       packageList.insert( pack->name(), pack );
       origPackageList.insert( pack->name(), pack );
-      empty=false;
     };
+  empty=false;
   updateSections( pack );
 }
 
 void PackageList::filterPackages( QString f )
         {
   packageList.clear();
   QDictIterator<Package> filterIter( origPackageList );
   filterIter.toFirst();
   Package *pack= filterIter.current() ;
   while ( pack )
             {
       if (
                         ((aktSection=="All")||(pack->section()==aktSection)) &&
                                         ((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
                          pack->name().contains( f )
                         )
                         {
                         packageList.insert( pack->name(), pack );
                         }
       ++filterIter;
       pack = filterIter.current();
     }
 }