Mercurial > audlegacy
comparison audacious/skin.c @ 638:72ec4db929ed trunk
[svn] Do not throw SIGABRT when path == NULL, g_return_val_if_fail logs a critical message and will abort. Patch courtesy of Daniel Drake from Gentoo.
| author | chainsaw |
|---|---|
| date | Sat, 18 Feb 2006 13:21:21 -0800 |
| parents | 0a73d1faeb4e |
| children | 9d2c175e458e |
comparison
equal
deleted
inserted
replaced
| 637:2b06eb5e472d | 638:72ec4db929ed |
|---|---|
| 836 skin_load(Skin * skin, const gchar * path) | 836 skin_load(Skin * skin, const gchar * path) |
| 837 { | 837 { |
| 838 gboolean error; | 838 gboolean error; |
| 839 | 839 |
| 840 g_return_val_if_fail(skin != NULL, FALSE); | 840 g_return_val_if_fail(skin != NULL, FALSE); |
| 841 g_return_val_if_fail(path != NULL, FALSE); | 841 |
| 842 if (!path) | |
| 843 return FALSE; | |
| 842 | 844 |
| 843 skin_lock(skin); | 845 skin_lock(skin); |
| 844 error = skin_load_nolock(skin, path, FALSE); | 846 error = skin_load_nolock(skin, path, FALSE); |
| 845 skin_unlock(skin); | 847 skin_unlock(skin); |
| 846 | 848 |