diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 69c678bad..8e918cdbe 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-12  Christophe Fergeau  <teuf@gnome.org>
+
+	* actions/acme-volume-gstreamer.c:
+	(acme_volume_gstreamer_get_volume): fix crash when trying to change 
+	volume using the multimedia keys, fixes #307351
+
 2005-03-23  Carlos Garnacho Parro  <carlosg@gnome.org>
 
 	* gnome-settings-accessibility-keyboard.c: make sticky keys and slow
diff --git a/gnome-settings-daemon/actions/acme-volume-gstreamer.c b/gnome-settings-daemon/actions/acme-volume-gstreamer.c
index dbe652234..4d5b8cd0e 100644
--- a/gnome-settings-daemon/actions/acme-volume-gstreamer.c
+++ b/gnome-settings-daemon/actions/acme-volume-gstreamer.c
@@ -147,10 +147,11 @@ acme_volume_gstreamer_get_volume (AcmeVolume *vol)
 {
 	double volume;
 	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
-	GstMixerTrack *track = self->_priv->track;
+	GstMixerTrack *track;
 	
 	if (acme_volume_gstreamer_open (self) == FALSE)
 		return 0;
+	track = self->_priv->track;
 
 	update_state (self);