@@ -40,7 +40,7 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
4040 QString appId = imageId.split('/').first();
4141
4242 ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
43− if (app == NULL) {
43+ if (app == nullptr) {
4444 return QImage();
4545 }
4646
@@ -51,16 +51,18 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
5151 qWarning() << "failed loading app image" << filePath;
5252 }
5353
54− QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
5554
5655 if (app->stage() == ApplicationInfo::SideStage) {
5756 QByteArray gus = qgetenv("GRID_UNIT_PX");
5857 image = image.scaledToWidth(gus.toInt() * 48);
5958 } else {
59+ // Lets scale main stage applications to be the size of the screen/window.
60+ QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
6061 Q_FOREACH (QWindow *win, unity->allWindows()) {
6162 QQuickWindow *quickWin = qobject_cast<QQuickWindow*>(win);
6263 if (quickWin) {
6364 image = image.scaledToWidth(quickWin->width() - m_appManager->rightMargin());
65+ break;
6466 }
6567 }
6668 }