# HG changeset patch
# User Tomasz Mon <desowin@gmail.com>
# Date 1200719062 -3600
# Node ID 2b5ea5d4a63e3e87fd950ae8007b30f18a7eb212
# Parent  2281da647da99a738b05a3e97a5d92b7bc63ffaa# Parent  1ee48928656b66761db90c10b945c6b9c403612e
branch merge

diff -r 2281da647da9 -r 2b5ea5d4a63e src/audacious/main.c
--- a/src/audacious/main.c	Sat Jan 19 06:03:03 2008 +0100
+++ b/src/audacious/main.c	Sat Jan 19 06:04:22 2008 +0100
@@ -1383,9 +1383,16 @@
 
     if (error != NULL)
     {
-        g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
-	  argv[0], error->message, argv[0]);
-        exit(EXIT_FAILURE);
+        if(error->message)
+        {   /* checking for MacOS X -psn_0_* errors*/
+            char* s = g_strrstr(error->message,"-psn_0_");
+            if(!s)
+            {
+                g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
+                        argv[0], error->message, argv[0]);
+                exit(EXIT_FAILURE);
+            }
+        }
     }
 
     if (!gtk_init_check_ok) {
diff -r 2281da647da9 -r 2b5ea5d4a63e src/audacious/ui_credits.c
--- a/src/audacious/ui_credits.c	Sat Jan 19 06:03:03 2008 +0100
+++ b/src/audacious/ui_credits.c	Sat Jan 19 06:04:22 2008 +0100
@@ -87,6 +87,7 @@
     "Michael Färber",
     "Shay Green",
     "Matti Hämäläinen",
+    "Sascha Hlusiak",
     "Giacomo Lozito",
     "Cristi Măgherușan",
     "Tomasz Moń",
diff -r 2281da647da9 -r 2b5ea5d4a63e src/libid3tag/field.c
--- a/src/libid3tag/field.c	Sat Jan 19 06:03:03 2008 +0100
+++ b/src/libid3tag/field.c	Sat Jan 19 06:04:22 2008 +0100
@@ -120,36 +120,48 @@
 
   case ID3_FIELD_TYPE_LATIN1:
   case ID3_FIELD_TYPE_LATIN1FULL:
-    if (field->latin1.ptr)
+    if (field->latin1.ptr) {
       free(field->latin1.ptr);
+      field->latin1.ptr = NULL;
+    }
     break;
 
   case ID3_FIELD_TYPE_LATIN1LIST:
-    for (i = 0; i < field->latin1list.nstrings; ++i)
-      free(field->latin1list.strings[i]);
+    if (field->latin1list.strings) {
+      for (i = 0; i < field->latin1list.nstrings; ++i)
+        free(field->latin1list.strings[i]);
 
-    if (field->latin1list.strings)
       free(field->latin1list.strings);
+      field->latin1list.nstrings = 0;
+      field->latin1list.strings = NULL;
+    }
     break;
 
   case ID3_FIELD_TYPE_STRING:
   case ID3_FIELD_TYPE_STRINGFULL:
-    if (field->string.ptr)
+    if (field->string.ptr) {
       free(field->string.ptr);
+      field->string.ptr = NULL;
+    }
     break;
 
   case ID3_FIELD_TYPE_STRINGLIST:
-    for (i = 0; i < field->stringlist.nstrings; ++i)
-      free(field->stringlist.strings[i]);
+    if (field->stringlist.strings) {
+      for (i = 0; i < field->stringlist.nstrings; ++i)
+        free(field->stringlist.strings[i]);
 
-    if (field->stringlist.strings)
       free(field->stringlist.strings);
+      field->stringlist.nstrings = 0;
+      field->stringlist.strings = NULL;
+    }
     break;
 
   case ID3_FIELD_TYPE_INT32PLUS:
   case ID3_FIELD_TYPE_BINARYDATA:
-    if (field->binary.data)
-      free(field->binary.data);
+    if (field->binary.data) {
+       free(field->binary.data);
+       field->binary.data = NULL;
+    }
     break;
   }