From c210b7720b46134a1d2539387fe3fcdf0b4082ab Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Tue, 13 Nov 2007 15:20:34 +0000
Subject: Do not fail if there is not an activity service

---
(limited to 'shell')

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:
--
cgit v0.9.1