Do not fail if there is not an activity service

2 files changed, 8 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 340120b..96eb015 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* Do not fail if there is not an activity service. (marco)
 * Alert when an activity cannot be saved. (rwh)
 
 Snapshot 47e231311b
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index f636230..05e058e 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -171,11 +171,13 @@ class Shell(gobject.GObject):
 
         home_model = self._model.get_home()
         activity = home_model.get_active_activity()
-        if activity:
-            try:
-                activity.get_service().TakeScreenshot(timeout=2.0)
-            except dbus.DBusException, e:
-                logging.debug('Error raised by TakeScreenshot(): %s', e)
+        if activity is not None:
+            service = activity.get_service()
+            if service is not None:
+                try:
+                    service.TakeScreenshot(timeout=2.0)
+                except dbus.DBusException, e:
+                    logging.debug('Error raised by TakeScreenshot(): %s', e)
 
     def set_zoom_level(self, level):
         if level == self._zoom_level: