1 files changed, 7 insertions, 1 deletions

diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 8bca892..539ebf0 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -112,3 +112,4 @@ void Server :: readLocalIpks( Server *local )
 
-        QString packageName = Utils::getPackageNameFromIpkFilename( file );
+        // Changed to display the filename (excluding the path)
+        QString packageName = Utils::getFilenameFromIpkFilename( file );
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
@@ -229,2 +230,7 @@ void Server :: buildLocalPackages( Server *local )
                 QString name = packageList[i].getPackageName();
+
+        // If the package name is an ipk name, then convert the filename to a package name
+        if ( name.find( ".ipk" ) != -1 )
+            name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() );
+
         if ( local )