Prevent activity launching being locked by error during launch.
This commit is contained in:
parent
8a88de864b
commit
c0cd2cf9a6
@ -140,7 +140,7 @@ class Shell(gobject.GObject):
|
|||||||
logging.debug('Shell.start_activity')
|
logging.debug('Shell.start_activity')
|
||||||
|
|
||||||
self._activities_starting.add(activity_type)
|
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 = self._model.get_home()
|
||||||
@ -148,6 +148,8 @@ class Shell(gobject.GObject):
|
|||||||
activity_type)
|
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
|
# Zoom to Home for launch feedback
|
||||||
self.set_zoom_level(sugar.ZOOM_HOME)
|
self.set_zoom_level(sugar.ZOOM_HOME)
|
||||||
|
Loading…
Reference in New Issue
Block a user