git.iko.soy/unity8
on xenial help sign in
catch more exceptions
2fa3cceMichael Zanetti
plugins/Unity/Launcher/ualwrapper.cpp+19−17
compare with xenial
unifiedsplit
@@ -14,9 +14,14 @@ UalWrapper::UalWrapper(QObject *parent):
14QStringList UalWrapper::installedApps()
14QStringList UalWrapper::installedApps()
15{
15{
16 QStringList appIds;
16 QStringList appIds;
17+ try {
17− for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
18+ for (const std::shared_ptr<Application> &app : Registry::installedApps()) {
18− appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
19+ appIds << QString::fromStdString(app->appId().package) + QStringLiteral("_") + QString::fromStdString(app->appId().appname);
20+ }
21+ } catch(std::runtime_error &e) {
22+ qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
19 }
23 }
24+
20 return appIds;
25 return appIds;
21}
26}
22
27
@@ -24,24 +29,21 @@ UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
24{
29{
25 AppInfo info;
30 AppInfo info;
26
31
32+ try {
27− AppID ualAppId = AppID::find(appId.toStdString());
33+ AppID ualAppId = AppID::find(appId.toStdString());
28− if (ualAppId.empty()) {
34+ if (ualAppId.empty()) {
29− return info;
35+ return info;
30− }
36+ }
31
37
32− std::shared_ptr<Application> ualApp;
38+ std::shared_ptr<Application> ualApp;
33− try
34− {
35 ualApp = Application::create(ualAppId, Registry::getDefault());
39 ualApp = Application::create(ualAppId, Registry::getDefault());
36− }
40+
41+ info.valid = true;
42+ info.name = QString::fromStdString(ualApp->info()->name());
43+ info.icon = QString::fromStdString(ualApp->info()->iconPath());
37− catch (std::runtime_error &e)
44+ } catch(std::runtime_error &e) {
38− {
39− qWarning() << "Couldn't find application info for" << appId << "-" << e.what();
45+ qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
40− return info;
41 }
46 }
42
47
43− info.valid = true;
44− info.name = QString::fromStdString(ualApp->info()->name());
45− info.icon = QString::fromStdString(ualApp->info()->iconPath());
46 return info;
48 return info;
47}
49}