From c0cd2cf9a60986ab90f696470c0b2db84ac62b1e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Fri, 16 Mar 2007 14:04:49 +0100 Subject: [PATCH] Prevent activity launching being locked by error during launch. --- shell/view/Shell.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/shell/view/Shell.py b/shell/view/Shell.py index b8678ddb..6d74f299 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -140,14 +140,16 @@ class Shell(gobject.GObject): logging.debug('Shell.start_activity') self._activities_starting.add(activity_type) + try: + handler = activityfactory.create(activity_type) - handler = activityfactory.create(activity_type) + home_model = self._model.get_home() + home_model.notify_activity_launch(handler.get_activity_id(), + activity_type) - home_model = self._model.get_home() - home_model.notify_activity_launch(handler.get_activity_id(), - activity_type) - - handler.connect('error', self._start_error_cb, home_model) + handler.connect('error', self._start_error_cb, home_model) + except: + self._activities_starting.remove(activity_type) # Zoom to Home for launch feedback self.set_zoom_level(sugar.ZOOM_HOME)