changeset 2478:54bea5c43ed8 trunk

[svn] - prevent player from crashing when bmp_cfg_db_get_string(db, CDDA, directory, &path) in add_medium returns FALSE
author giacomo
date Mon, 05 Feb 2007 16:28:03 -0800
parents e07075f0c7f3
children 358edfe97cfa
files ChangeLog src/audacious/build_stamp.c src/audacious/ui_main.c
diffstat 3 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 05 08:47:10 2007 -0800
+++ b/ChangeLog	Mon Feb 05 16:28:03 2007 -0800
@@ -1,3 +1,10 @@
+2007-02-05 16:47:10 +0000  Alexandr Orlov <alxorlov@pochta.ru>
+  revision [3964]
+  Update russian translation
+  trunk/po/ru.po |  124 +++++++++++----------------------------------------------
+  1 file changed, 24 insertions(+), 100 deletions(-)
+
+
 2007-02-05 06:41:31 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3962]
   Update turkish translation via murat. Closes #774.
--- a/src/audacious/build_stamp.c	Mon Feb 05 08:47:10 2007 -0800
+++ b/src/audacious/build_stamp.c	Mon Feb 05 16:28:03 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070205-3962";
+const gchar *svn_stamp = "20070205-3964";
--- a/src/audacious/ui_main.c	Mon Feb 05 08:47:10 2007 -0800
+++ b/src/audacious/ui_main.c	Mon Feb 05 16:28:03 2007 -0800
@@ -2805,8 +2805,14 @@
 
     db = bmp_cfg_db_open();
 
-    bmp_cfg_db_get_string(db, "CDDA", "directory", &path);
-    bmp_cfg_db_close(db);
+    if ( bmp_cfg_db_get_string(db, "CDDA", "directory", &path) != TRUE )
+    {
+        bmp_cfg_db_close(db);
+        run_no_audiocd_dialog();
+        return;
+    }
+    else
+        bmp_cfg_db_close(db);
 
     if (!(list = input_scan_dir(path))) {
         run_no_audiocd_dialog();