comparison src/adplug/adplug-xmms.cc @ 1045:028b7ca16d30 trunk

[svn] - fix crash if Exclude does not exist.

1044:b1128efde471

                       (gboolean *) & cfg.endless);

  // Read file type exclusion list
  dbg_printf ("exclusion, ");
  {
    gchar *cfgstr = NULL, *exclude;
    gboolean cfgread;

    cfgread = bmp_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr);
    exclude = (char *) malloc (strlen (cfgstr) + 2);
    strcpy (exclude, cfgstr);
    exclude[strlen (exclude) + 1] = '\0';
    if (cfgread)
      free (cfgstr);
    g_strdelimit (exclude, ":", '\0');
    for (gchar * p = exclude; *p; p += strlen (p) + 1)
      cfg.players.remove (cfg.players.lookup_filetype (p));
    free (exclude);
  }
  bmp_cfg_db_close (db);

  // Load database from disk and hand it to AdPlug
  dbg_printf ("database");

1045:028b7ca16d30

                       (gboolean *) & cfg.endless);

  // Read file type exclusion list
  dbg_printf ("exclusion, ");
  {
    gchar *cfgstr = NULL, *exclude = NULL;
    gboolean cfgread;

    cfgread = bmp_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr);
    if (cfgread) {
        exclude = (char *) malloc (strlen (cfgstr) + 2);
        strcpy (exclude, cfgstr);
        exclude[strlen (exclude) + 1] = '\0';
        g_strdelimit (exclude, ":", '\0');
        for (gchar * p = exclude; *p; p += strlen (p) + 1)
            cfg.players.remove (cfg.players.lookup_filetype (p));
        free (exclude); free (cfgstr);
    }
  }
  bmp_cfg_db_close (db);

  // Load database from disk and hand it to AdPlug
  dbg_printf ("database");