@@ -16,7 +16,11 @@ QStringList UalWrapper::installedApps()
1616 QStringList appIds;
1717 try {
1818 for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
19− appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
19+ if (!QString::fromStdString(app->appId().package).isEmpty()) {
20+ appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
21+ } else {
22+ appIds << QString::fromStdString(app->appId().appname);
23+ }
2024 }
2125 } catch(std::runtime_error &e) {
2226 qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
@@ -32,15 +36,16 @@ UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
3236 try {
3337 AppID ualAppId = AppID::find(appId.toStdString());
3438 if (ualAppId.empty()) {
39+ qWarning() << "Empty ualAppId result for" << appId;
3540 return info;
3641 }
3742
3843 std::shared_ptr<Application> ualApp;
3944 ualApp = Application::create(ualAppId, Registry::getDefault());
4045
41− info.valid = true;
4246 info.name = QString::fromStdString(ualApp->info()->name());
4347 info.icon = QString::fromStdString(ualApp->info()->iconPath());
48+ info.valid = true;
4449 } catch(std::runtime_error &e) {
4550 qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
4651 }