Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

2007-10-18 23:59:09 +02:00 · 2007-10-18 23:59:09 +02:00 · 099d279d7e
commit 099d279d7e
parent 58f7dca355 78f51a1b56
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -1,6 +1,10 @@
 * Fullscreen support (hide toolbar and tray) and tray support in activity 
 window (erikos)

+Snapshot b023dd17a2
+
+* Fix a crash in the emulator (marco)
+
 Snapshot 276e1ee517

 * #4266 Avoid misleading warning every time an activity starts (smcv)
--- a/shell/hardware/hardwaremanager.py
+++ b/shell/hardware/hardwaremanager.py
@ -45,7 +45,7 @@ class HardwareManager(object):
        self._mixer = gst.element_factory_make('alsamixer')
        self._mixer.set_state(gst.STATE_PAUSED)

-
+        self._master = None
        for track in self._mixer.list_tracks():
            if track.flags & gst.interfaces.MIXER_TRACK_MASTER:
                self._master = track