public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-misc/workrave/files: workrave-1.9.1-nogst-crash.patch workrave-1.9.0-service.in workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml workrave-1.9.0-parallel-make.patch workrave-1.9.0-gcc44.patch workrave-1.9.0-nosoundplayer.patch workrave-1.9.0-compilation-fixes.patch workrave-1.9.0-dbus-glib.xml
@ 2010-06-16 16:09 Pacho Ramos (pacho)
  0 siblings, 0 replies; only message in thread
From: Pacho Ramos (pacho) @ 2010-06-16 16:09 UTC (permalink / raw
  To: gentoo-commits

pacho       10/06/16 16:09:15

  Added:                workrave-1.9.1-nogst-crash.patch
  Removed:              workrave-1.9.0-service.in
                        workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml
                        workrave-1.9.0-parallel-make.patch
                        workrave-1.9.0-gcc44.patch
                        workrave-1.9.0-nosoundplayer.patch
                        workrave-1.9.0-compilation-fixes.patch
                        workrave-1.9.0-dbus-glib.xml
  Log:
  Revision bump fixing bug 316637 and remove old testing
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch?rev=1.1&content-type=text/plain

Index: workrave-1.9.1-nogst-crash.patch
===================================================================
--- frontend/common/src/SoundPlayer.cc.orig	2010-06-16 10:49:11.000000000 +0200
+++ frontend/common/src/SoundPlayer.cc	2010-06-16 10:54:04.000000000 +0200
@@ -334,8 +334,11 @@
 void
 SoundPlayer::init()
 {
-  driver->init();
-  register_sound_events();
+  if (driver != NULL)
+  {
+    driver->init();
+    register_sound_events();
+  }
 }
 
 void
@@ -405,6 +408,10 @@
 void
 SoundPlayer::sync_settings()
 {
+  if (driver == NULL)
+    {
+      return;
+    }
   if (driver != NULL)
     {
       for (unsigned int i = 0; i < sizeof(sound_registry)/sizeof(sound_registry[0]); i++)






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-06-16 16:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-16 16:09 [gentoo-commits] gentoo-x86 commit in app-misc/workrave/files: workrave-1.9.1-nogst-crash.patch workrave-1.9.0-service.in workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml workrave-1.9.0-parallel-make.patch workrave-1.9.0-gcc44.patch workrave-1.9.0-nosoundplayer.patch workrave-1.9.0-compilation-fixes.patch workrave-1.9.0-dbus-glib.xml Pacho Ramos (pacho)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox